Ensure correct default CFLAGS and CXXFLAGS for build variants.
Additional work for closed ticket #140
This commit is contained in:
parent
893bca9a89
commit
0131a0fbe6
@ -14,17 +14,20 @@ thirdparty_library_includes+=-I ${srcdir}/third_party/FakeIt/config/catch
|
||||
#test_disabled_warnings=-Wno-deprecated-declarations -Wno-defaulted-function-deleted\
|
||||
# -Wno-zero-length-array
|
||||
|
||||
tests_addl_cflags=
|
||||
tests_addl_cflags+= -I ${srcdir}/src/tests -DUNIT_TEST=1
|
||||
tests_addl_cflags+= $(CATCH2_CFLAGS)
|
||||
tests_addl_cflags+= $(thirdparty_library_includes)
|
||||
tests_addl_cppflags=
|
||||
tests_addl_cppflags+= -I ${srcdir}/src/tests -DUNIT_TEST=1
|
||||
|
||||
tests_addl_cxxflags=
|
||||
tests_addl_cxxflags+= $(CATCH2_CFLAGS) $(SDL2_CFLAGS)
|
||||
tests_addl_cxxflags+= $(thirdparty_library_includes)
|
||||
|
||||
game_tests_CPPFLAGS= $(AM_CPPFLAGS) $(PROJECT_INCLUDE_FLAGS)
|
||||
game_tests_CPPFLAGS+= $(tests_addl_cflags)
|
||||
game_tests_CPPFLAGS+= $(SDL2_CFLAGS) -DUNIT_TEST=1
|
||||
game_tests_CPPFLAGS+= $(tests_addl_cppflags)
|
||||
game_tests_CPPFLAGS+= -DUNIT_TEST=1
|
||||
|
||||
game_tests_CXXFLAGS= ${AM_CXXFLAGS}
|
||||
#game_tests_CXXFLAGS+=${test_disabled_warnings}
|
||||
game_tests_CXXFLAGS=
|
||||
game_tests_CXXFLAGS+=${AM_CXXFLAGS}
|
||||
game_tests_CXXFLAGS+= $(tests_addl_cxxflags)
|
||||
|
||||
game_tests_LDADD= libframework-core-test.la
|
||||
game_tests_LDADD+= $(CATCH2_LIBS) $(SDL2_LIBS) $(NLOHMANN_JSON_LIBS)
|
||||
|
Loading…
Reference in New Issue
Block a user