diff options
author | Cameron Hart <cam@bitshifter.net.nz> | 2012-12-20 10:04:12 +0400 |
---|---|---|
committer | Cameron Hart <cam@bitshifter.net.nz> | 2012-12-20 10:04:12 +0400 |
commit | c4f25fcad40f33d9a9a11168d9f6bbc20111e5f9 (patch) | |
tree | 9f7670fc4c5f0fede99daa8f36fa92b8f438b429 /tests | |
parent | e9599feea3b3b42d92797ac789c43dadcee81f29 (diff) |
Use ALL_CPPFLAGS, ALL_CFLAGS, ALL_CXXFLAGS and ALL_LDFLAGS internally so CFLAGS etc can be overridden on the command line.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/actions/make/test_make_pch.lua | 6 | ||||
-rw-r--r-- | tests/actions/make/test_wiidev.lua | 8 | ||||
-rw-r--r-- | tests/test_gmake_cpp.lua | 38 |
3 files changed, 26 insertions, 26 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 diff --git a/tests/test_gmake_cpp.lua b/tests/test_gmake_cpp.lua index 3ccd8d1..d87a1bf 100644 --- a/tests/test_gmake_cpp.lua +++ b/tests/test_gmake_cpp.lua @@ -78,14 +78,14 @@ ifeq ($(config),debug) TARGET = $(TARGETDIR)/MyProject DEFINES += INCLUDES += - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) - CXXFLAGS += $(CFLAGS) - LDFLAGS += -s + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -s RESFLAGS += $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS) define PREBUILDCMDS endef define PRELINKCMDS @@ -112,14 +112,14 @@ ifeq ($(config),debugps3) TARGET = $(TARGETDIR)/MyProject.elf DEFINES += INCLUDES += - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) - CXXFLAGS += $(CFLAGS) - LDFLAGS += -s + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -s RESFLAGS += $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS) define PREBUILDCMDS endef define PRELINKCMDS @@ -143,14 +143,14 @@ ifeq ($(config),debug64) TARGET = $(TARGETDIR)/MyProject DEFINES += INCLUDES += - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -m64 - CXXFLAGS += $(CFLAGS) - LDFLAGS += -s -m64 -L/usr/lib64 + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -m64 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -s -m64 -L/usr/lib64 RESFLAGS += $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS) define PREBUILDCMDS endef define PRELINKCMDS @@ -175,10 +175,10 @@ ifeq ($(config),debuguniv32) TARGET = $(TARGETDIR)/libMyProject.a DEFINES += INCLUDES += - CPPFLAGS += $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -arch i386 -arch ppc - CXXFLAGS += $(CFLAGS) - LDFLAGS += -s -arch i386 -arch ppc + ALL_CPPFLAGS += $(CPPFLAGS) $(DEFINES) $(INCLUDES) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -arch i386 -arch ppc + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_LDFLAGS += $(LDFLAGS) -s -arch i386 -arch ppc RESFLAGS += $(DEFINES) $(INCLUDES) LIBS += LDDEPS += |