Created
December 6, 2013 11:11
-
-
Save nikki93/7822094 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -r 977b89b57b90 code/build/premake4.lua | |
| --- a/code/build/premake4.lua Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/code/build/premake4.lua Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -231,16 +231,16 @@ | |
| buildoptions | |
| { | |
| "-x c++", | |
| - "-isysroot /Developer/SDKs/MacOSX10.6.sdk", | |
| - "-mmacosx-version-min=10.6", | |
| + --"-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk", | |
| + --"-mmacosx-version-min=10.9", | |
| "-gdwarf-2", | |
| "-Wno-write-strings", | |
| "-fvisibility-inlines-hidden" | |
| } | |
| linkoptions | |
| { | |
| - "-isysroot /Developer/SDKs/MacOSX10.6.sdk", | |
| - "-mmacosx-version-min=10.6", | |
| + --"-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk", | |
| + --"-mmacosx-version-min=10.9", | |
| "-dead_strip" | |
| } | |
| diff -r 977b89b57b90 extern/glfw-2.7/include/GL/glext.h | |
| --- a/extern/glfw-2.7/include/GL/glext.h Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/extern/glfw-2.7/include/GL/glext.h Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -6215,7 +6215,11 @@ | |
| #ifndef GL_ARB_shader_objects | |
| /* GL types for program/shader text and shader object handles */ | |
| typedef char GLcharARB; | |
| -typedef unsigned int GLhandleARB; | |
| +#if defined(__APPLE__) | |
| + typedef void *GLhandleARB; | |
| +#else | |
| + typedef unsigned int GLhandleARB; | |
| +#endif | |
| #endif | |
| /* GL type for "half" precision (s10e5) float data in host memory */ | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/01_Object.make | |
| --- a/tutorial/build/mac/gmake/01_Object.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/01_Object.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/01_Object | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -49,14 +49,14 @@ | |
| TARGET = $(TARGETDIR)/01_Object | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -71,16 +71,16 @@ | |
| OBJDIR = obj/x64/Release/01_Object | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/01_Object | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -97,14 +97,14 @@ | |
| TARGET = $(TARGETDIR)/01_Object | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -121,14 +121,14 @@ | |
| TARGET = $(TARGETDIR)/01_Object | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -143,16 +143,16 @@ | |
| OBJDIR = obj/x32/Release/01_Object | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/01_Object | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -221,17 +221,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/01_Object.o: ../../../src/01_Object.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/02_Clock.make | |
| --- a/tutorial/build/mac/gmake/02_Clock.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/02_Clock.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/02_Clock | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/02_Clock | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/02_Clock | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/02_Clock | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/02_Clock | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/02_Clock | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/02_Clock | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/02_Clock | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/02_Clock.o: ../../../src/02_Clock.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/03_Frame.make | |
| --- a/tutorial/build/mac/gmake/03_Frame.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/03_Frame.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/03_Frame | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/03_Frame | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/03_Frame | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/03_Frame | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/03_Frame | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/03_Frame | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/03_Frame | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/03_Frame | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/03_Frame.o: ../../../src/03_Frame.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/04_Anim.make | |
| --- a/tutorial/build/mac/gmake/04_Anim.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/04_Anim.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/04_Anim | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/04_Anim | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/04_Anim | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/04_Anim | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/04_Anim | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/04_Anim | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/04_Anim | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/04_Anim | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/04_Anim.o: ../../../src/04_Anim.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/05_Viewport.make | |
| --- a/tutorial/build/mac/gmake/05_Viewport.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/05_Viewport.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/05_Viewport | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/05_Viewport | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/05_Viewport | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/05_Viewport.o: ../../../src/05_Viewport.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/06_Sound.make | |
| --- a/tutorial/build/mac/gmake/06_Sound.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/06_Sound.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/06_Sound | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/06_Sound | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/06_Sound | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/06_Sound | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/06_Sound | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/06_Sound | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/06_Sound | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/06_Sound | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/06_Sound.o: ../../../src/06_Sound.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/07_FX.make | |
| --- a/tutorial/build/mac/gmake/07_FX.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/07_FX.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/07_FX | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/07_FX | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/07_FX | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/07_FX | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/07_FX | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/07_FX | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/07_FX | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/07_FX | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/07_FX.o: ../../../src/07_FX.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/08_Physics.make | |
| --- a/tutorial/build/mac/gmake/08_Physics.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/08_Physics.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/08_Physics | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/08_Physics | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/08_Physics | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/08_Physics | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/08_Physics | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/08_Physics | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/08_Physics | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/08_Physics | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/08_Physics.o: ../../../src/08_Physics.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/09_Scrolling.make | |
| --- a/tutorial/build/mac/gmake/09_Scrolling.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/09_Scrolling.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/09_Scrolling | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/09_Scrolling | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/09_Scrolling | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/09_Scrolling.o: ../../../src/09_Scrolling.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/10_Locale.make | |
| --- a/tutorial/build/mac/gmake/10_Locale.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/10_Locale.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/10_Locale | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/10_Locale | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/10_Locale | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/10_Locale | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/10_Locale | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/10_Locale | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/10_Locale | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/10_Locale | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CXX) -x c++-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/10_Locale.o: ../../../src/10_Locale.cpp | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CXX) $(ALL_CXXFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/11_Spawner.make | |
| --- a/tutorial/build/mac/gmake/11_Spawner.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/11_Spawner.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/11_Spawner | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/11_Spawner | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/11_Spawner | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/11_Spawner.o: ../../../src/11_Spawner.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/mac/gmake/12_Lighting.make | |
| --- a/tutorial/build/mac/gmake/12_Lighting.make Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/mac/gmake/12_Lighting.make Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -25,14 +25,14 @@ | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -47,14 +47,14 @@ | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -67,16 +67,16 @@ | |
| OBJDIR = obj/x64/Release/12_Lighting | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m64 -L/usr/lib64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m64 -gdwarf-2 -Wno-write-strings | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m64 -L/usr/lib64 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -91,14 +91,14 @@ | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| DEFINES += -D__orxDEBUG__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxd -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -113,14 +113,14 @@ | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| DEFINES += -D__orxPROFILER__ | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorxp -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -133,16 +133,16 @@ | |
| OBJDIR = obj/x32/Release/12_Lighting | |
| TARGETDIR = ../../../bin | |
| TARGET = $(TARGETDIR)/12_Lighting | |
| - DEFINES += | |
| + DEFINES += | |
| INCLUDES += -I../../../include -I../../../../code/include | |
| - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) | |
| - CFLAGS += $(CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| - CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti | |
| - LDFLAGS += -L../../../lib -L../../../../code/lib/dynamic -m32 -L/usr/lib32 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -dead_strip | |
| - RESFLAGS += $(DEFINES) $(INCLUDES) | |
| + ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) $(FORCE_INCLUDE) | |
| + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -msse2 -ffast-math -g -O2 -m32 -gdwarf-2 -Wno-write-strings -mfix-and-continue | |
| + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-exceptions -fno-rtti | |
| + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) | |
| + ALL_LDFLAGS += $(LDFLAGS) -L../../../lib -L../../../../code/lib/dynamic -L. -m32 -L/usr/lib32 -dead_strip | |
| LIBS += -lorx -framework Foundation -framework AppKit | |
| - LDDEPS += | |
| - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(LDFLAGS) | |
| + LDDEPS += | |
| + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) | |
| define PREBUILDCMDS | |
| endef | |
| define PRELINKCMDS | |
| @@ -209,17 +209,12 @@ | |
| ifneq (,$(PCH)) | |
| $(GCH): $(PCH) | |
| @echo $(notdir $<) | |
| -ifeq (posix,$(SHELLTYPE)) | |
| - -$(SILENT) cp $< $(OBJDIR) | |
| -else | |
| - $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul | |
| -endif | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.gch=%.d) -c "$<" | |
| + $(SILENT) $(CC) -x c-header $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" | |
| endif | |
| $(OBJDIR)/12_Lighting.o: ../../../src/12_Lighting.c | |
| @echo $(notdir $<) | |
| - $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| + $(SILENT) $(CC) $(ALL_CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" | |
| -include $(OBJECTS:%.o=%.d) | |
| ifneq (,$(PCH)) | |
| diff -r 977b89b57b90 tutorial/build/premake4.lua | |
| --- a/tutorial/build/premake4.lua Thu Dec 05 23:55:39 2013 -0500 | |
| +++ b/tutorial/build/premake4.lua Fri Dec 06 06:06:42 2013 -0500 | |
| @@ -183,8 +183,6 @@ | |
| configuration {"macosx"} | |
| buildoptions | |
| { | |
| - "-isysroot /Developer/SDKs/MacOSX10.6.sdk", | |
| - "-mmacosx-version-min=10.6", | |
| "-gdwarf-2", | |
| "-Wno-write-strings" | |
| } | |
| @@ -195,8 +193,6 @@ | |
| } | |
| linkoptions | |
| { | |
| - "-isysroot /Developer/SDKs/MacOSX10.6.sdk", | |
| - "-mmacosx-version-min=10.6", | |
| "-dead_strip" | |
| } | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment