diff options
Diffstat (limited to 'tests/actions/make')
-rw-r--r-- | tests/actions/make/test_make_pch.lua | 6 | ||||
-rw-r--r-- | tests/actions/make/test_wiidev.lua | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/actions/make/test_make_pch.lua b/tests/actions/make/test_make_pch.lua index ee48a1b..c471e09 100644 --- a/tests/actions/make/test_make_pch.lua +++ b/tests/actions/make/test_make_pch.lua @@ -51,7 +51,7 @@ test.capture [[ PCH = include/myproject.h GCH = $(OBJDIR)/myproject.h.gch - CPPFLAGS += -I$(OBJDIR) -include $(OBJDIR)/myproject.h + ALL_CPPFLAGS += -I$(OBJDIR) -include $(OBJDIR)/myproject.h ]] end @@ -73,7 +73,7 @@ ifeq (posix,$(SHELLTYPE)) else $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul endif - $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" endif ]] end @@ -92,7 +92,7 @@ ifeq (posix,$(SHELLTYPE)) else $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul endif - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" endif ]] end diff --git a/tests/actions/make/test_wiidev.lua b/tests/actions/make/test_wiidev.lua index fd0bfdd..4561b0c 100644 --- a/tests/actions/make/test_wiidev.lua +++ b/tests/actions/make/test_wiidev.lua @@ -32,10 +32,10 @@ function suite.writesCorrectFlags() cpp.flags(cfg, premake.gcc) test.capture [[ - CPPFLAGS += -MMD -MP -I$(LIBOGC_INC) $(MACHDEP) -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) - CXXFLAGS += $(CFLAGS) - LDFLAGS += -s -L$(LIBOGC_LIB) $(MACHDEP) + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -I$(LIBOGC_INC) $(MACHDEP) -MP $(DEFINES) $(INCLUDES) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -s -L$(LIBOGC_LIB) $(MACHDEP) RESFLAGS += $(DEFINES) $(INCLUDES) ]] end |