Index: ps/trunk/build/premake/premake5/build/gmake.macosx/Premake5.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/Premake5.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/Premake5.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim -I../../contrib/zlib -I../../contrib/libzip -I../../contrib/curl/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim -I../../contrib/zlib -I../../contrib/libzip -I../../contrib/curl/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -586,4 +586,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/curl-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/curl-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/curl-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/curl/include -I../../contrib/curl/lib -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/curl/include -I../../contrib/curl/lib -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -1279,4 +1279,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/example.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/example.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/example.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Release/libluashim-lib.a LDDEPS += bin/Release/libluashim-lib.a - ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Debug/libluashim-lib.a LDDEPS += bin/Debug/libluashim-lib.a - ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -145,4 +145,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/lua-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/lua-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/lua-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -424,4 +424,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/luashim-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/luashim-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/luashim-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -145,4 +145,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/mbedtls-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/mbedtls-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/mbedtls-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -766,4 +766,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/zip-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/zip-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/zip-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/libzip/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/libzip/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -910,4 +910,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/build/gmake.macosx/zlib-lib.make =================================================================== --- ps/trunk/build/premake/premake5/build/gmake.macosx/zlib-lib.make +++ ps/trunk/build/premake/premake5/build/gmake.macosx/zlib-lib.make @@ -27,12 +27,12 @@ INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -271,4 +271,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: ps/trunk/build/premake/premake5/premake5.lua =================================================================== --- ps/trunk/build/premake/premake5/premake5.lua +++ ps/trunk/build/premake/premake5/premake5.lua @@ -119,10 +119,6 @@ filter { "system:windows", "configurations:Release" } flags { "NoIncrementalLink", "LinkTimeOptimization" } - filter { "system:macosx", "action:gmake" } - buildoptions { "-mmacosx-version-min=10.4" } - linkoptions { "-mmacosx-version-min=10.4" } - project "Premake5" targetname "premake5" language "C"