|
@@ -29,7 +29,7 @@ UNAME=$(shell uname -s)
|
29
|
29
|
# -DUNICODE_SUPPORT Add unicode/internation keyboard support
|
30
|
30
|
# -DUSING_EMITTER_IN_GAME Run particle test in game
|
31
|
31
|
|
32
|
|
-BASE_DEFS=$(shell sdl2-config --cflags) -Iinclude -DUSING_EMITTER
|
|
32
|
+BASE_DEFS=-Iinclude -DUSING_EMITTER
|
33
|
33
|
|
34
|
34
|
BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
|
35
|
35
|
-lpthread -lSDL_ttf
|
|
@@ -42,15 +42,15 @@ ifeq ($(UNAME),Darwin)
|
42
|
42
|
AUDIO_LIBS += -lalut
|
43
|
43
|
AUDIO_LIBS += -framework OpenAL
|
44
|
44
|
AUDIO_LIBS += -L/usr/local/lib
|
45
|
|
-AUDIO_DEFS += -I/usr/local/include
|
|
45
|
+AUDIO_DEFS += -isystem /usr/local/include
|
46
|
46
|
GL_LIBS += -framework OpenGL
|
47
|
47
|
GL_LIBS += -L/opt/local/lib
|
48
|
|
-GL_DEFS += -I/opt/local/include
|
|
48
|
+GL_DEFS += -isystem /opt/local/include
|
49
|
49
|
else
|
50
|
50
|
AUDIO_LIBS += -lopenal -lalut
|
51
|
51
|
GL_LIBS += -lGL -lGLU
|
52
|
52
|
GL_LIBS += -L/usr/local/lib
|
53
|
|
-GL_DEFS += -I/usr/local/include
|
|
53
|
+GL_DEFS += -isystem /usr/local/include
|
54
|
54
|
endif
|
55
|
55
|
|
56
|
56
|
BASE_LIBS += $(AUDIO_LIBS)
|
|
@@ -208,16 +208,6 @@ CHECK_DIR=.
|
208
|
208
|
CHECK_STD=--std=c++11 --std=posix
|
209
|
209
|
CHECK_FLAGS=--quiet --force
|
210
|
210
|
CHECK_INC=-Iinclude
|
211
|
|
-#CHECK_INC+=$(GL_DEFS) $(AUDIO_DEFS)
|
212
|
|
-#ifeq ($(UNAME),Darwin)
|
213
|
|
-#SDK_ROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
|
214
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include
|
215
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include/malloc
|
216
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include/machine
|
217
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include/c++/4.2.1
|
218
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include/c++/4.2.1/tr1
|
219
|
|
-#CHECK_INC+=-I$(SDK_ROOT)/usr/include/c++/4.2.1/backward
|
220
|
|
-#endif
|
221
|
211
|
CHECK_NORMAL=--enable=information,warning,performance,portability
|
222
|
212
|
CHECK_FULL=--enable=all
|
223
|
213
|
CHECK_CONFIG=--check-config
|
|
@@ -362,7 +352,7 @@ TombRaider.test:
|
362
|
352
|
GLString.test:
|
363
|
353
|
mkdir -p $(BUILD_TEST_DIR)
|
364
|
354
|
$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
|
365
|
|
- $(shell sdl2-config --cflags) $(shell sdl2-config --libs) \
|
|
355
|
+ $(shell sdl2-config --libs) \
|
366
|
356
|
$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
|
367
|
357
|
src/Texture.cpp src/tga.cpp src/GLString.cpp \
|
368
|
358
|
test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
|