diff options
| author | Duncan Sands <baldrick@free.fr> | 2011-04-08 15:35:20 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2011-04-08 15:35:20 +0000 |
| commit | ce6bffde416516631689c80dd87d9e20fe6d9288 (patch) | |
| tree | 4fb26a19ff3f4c3ae98f472fa35e8462f9abd2d9 /dragonegg/Makefile | |
| parent | 404cbf0bb46c3a4e7be73b5e97e4d2c40982fdbd (diff) | |
Make sure that headers are searched for in the dragonegg sources
first. This partially fixes PR9656 where there was a file called
Target.h from somewhere else was floating around in the include path
before dragonegg's.
Diffstat (limited to 'dragonegg/Makefile')
| -rw-r--r-- | dragonegg/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dragonegg/Makefile b/dragonegg/Makefile index ecf14babdad..799678990ae 100644 --- a/dragonegg/Makefile +++ b/dragonegg/Makefile @@ -76,15 +76,15 @@ $(TARGET_UTIL): $(TARGET_UTIL_OBJECTS) %.o : $(SRC_DIR)/%.c $(TARGET_UTIL) @echo Compiling $*.c - $(QUIET)$(CC) -c $(CPP_OPTIONS) $(TARGET_HEADERS) $(CFLAGS) $< + $(QUIET)$(CC) -c $(TARGET_HEADERS) $(CPP_OPTIONS) $(CFLAGS) $< %.o : $(SRC_DIR)/%.cpp $(TARGET_UTIL) @echo Compiling $*.cpp - $(QUIET)$(CXX) -c $(CPP_OPTIONS) $(TARGET_HEADERS) $(CXXFLAGS) $< + $(QUIET)$(CXX) -c $(TARGET_HEADERS) $(CPP_OPTIONS) $(CXXFLAGS) $< $(TARGET_OBJECT): $(TARGET_UTIL) @echo Compiling $(shell $(TARGET_UTIL) -p)/Target.cpp - $(QUIET)$(CXX) -o $@ -c $(CPP_OPTIONS) $(TARGET_HEADERS) $(CXXFLAGS) \ + $(QUIET)$(CXX) -o $@ -c $(TARGET_HEADERS) $(CPP_OPTIONS) $(CXXFLAGS) \ $(TARGET_SOURCE) $(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OBJECT) $(TARGET_UTIL) |