소스 검색

No warnings for system headers

Thomas Buck 11 년 전
부모
커밋
ce958784e5
1개의 변경된 파일5개의 추가작업 그리고 15개의 파일을 삭제
  1. 5
    15
      Makefile

+ 5
- 15
Makefile 파일 보기

29
 # -DUNICODE_SUPPORT			Add unicode/internation keyboard support
29
 # -DUNICODE_SUPPORT			Add unicode/internation keyboard support
30
 # -DUSING_EMITTER_IN_GAME	Run particle test in game
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
 BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
34
 BASE_LIBS=$(shell sdl2-config --libs) -lz -lstdc++ \
35
 	-lpthread -lSDL_ttf
35
 	-lpthread -lSDL_ttf
42
 AUDIO_LIBS += -lalut
42
 AUDIO_LIBS += -lalut
43
 AUDIO_LIBS += -framework OpenAL
43
 AUDIO_LIBS += -framework OpenAL
44
 AUDIO_LIBS += -L/usr/local/lib
44
 AUDIO_LIBS += -L/usr/local/lib
45
-AUDIO_DEFS += -I/usr/local/include
45
+AUDIO_DEFS += -isystem /usr/local/include
46
 GL_LIBS += -framework OpenGL
46
 GL_LIBS += -framework OpenGL
47
 GL_LIBS += -L/opt/local/lib
47
 GL_LIBS += -L/opt/local/lib
48
-GL_DEFS += -I/opt/local/include
48
+GL_DEFS += -isystem /opt/local/include
49
 else
49
 else
50
 AUDIO_LIBS += -lopenal -lalut
50
 AUDIO_LIBS += -lopenal -lalut
51
 GL_LIBS += -lGL -lGLU
51
 GL_LIBS += -lGL -lGLU
52
 GL_LIBS += -L/usr/local/lib
52
 GL_LIBS += -L/usr/local/lib
53
-GL_DEFS += -I/usr/local/include
53
+GL_DEFS += -isystem /usr/local/include
54
 endif
54
 endif
55
 
55
 
56
 BASE_LIBS += $(AUDIO_LIBS)
56
 BASE_LIBS += $(AUDIO_LIBS)
208
 CHECK_STD=--std=c++11 --std=posix
208
 CHECK_STD=--std=c++11 --std=posix
209
 CHECK_FLAGS=--quiet --force
209
 CHECK_FLAGS=--quiet --force
210
 CHECK_INC=-Iinclude
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
 CHECK_NORMAL=--enable=information,warning,performance,portability
211
 CHECK_NORMAL=--enable=information,warning,performance,portability
222
 CHECK_FULL=--enable=all
212
 CHECK_FULL=--enable=all
223
 CHECK_CONFIG=--check-config
213
 CHECK_CONFIG=--check-config
362
 GLString.test:
352
 GLString.test:
363
 	mkdir -p $(BUILD_TEST_DIR)
353
 	mkdir -p $(BUILD_TEST_DIR)
364
 	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
354
 	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude \
365
-	$(shell sdl2-config --cflags) $(shell sdl2-config --libs) \
355
+	$(shell sdl2-config --libs) \
366
 	$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
356
 	$(GL_LIBS) $(GL_DEFS) -lSDL2_ttf -lm -lstdc++ \
367
 	src/Texture.cpp src/tga.cpp src/GLString.cpp \
357
 	src/Texture.cpp src/tga.cpp src/GLString.cpp \
368
 	test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
358
 	test/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test

Loading…
취소
저장