From 5650af67b19e8d438dfe042470d80478b04f8c20 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Tue, 27 Feb 2018 22:23:05 -0500 Subject: Makefile updates for build server. --- src/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 5e117964..a14ed805 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ ifeq (win, $(findstring win, $(MAKECMDGOALS))) # Cross-compile for Win32. CROSS = i686-w64-mingw32- CFLAGS = -mms-bitfields -Os - CXXFLAGS = -mms-bitfields -static-libgcc -static-libstdc++ -Os -std=gnu++0x + CXXFLAGS = -mms-bitfields -static-libgcc -static-libstdc++ -Os -std=c++0x LUA_CFLAGS = -DLUA_BUILD_AS_DLL -DLUA_LIB LDFLAGS = -Wl,--retain-symbols-file -Wl,lua.sym ifeq (, $(findstring curses, $(MAKECMDGOALS))) @@ -35,10 +35,8 @@ ifeq (win, $(findstring win, $(MAKECMDGOALS))) else ifeq (osx, $(findstring osx, $(MAKECMDGOALS))) # Cross-compile for Mac OSX. CROSS = i686-apple-darwin10- - CFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 \ - -isysroot /usr/lib/apple/SDKs/MacOSX10.5.sdk -Os - CXXFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 \ - -isysroot /usr/lib/apple/SDKs/MacOSX10.5.sdk -Os + CFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 -Os + CXXFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 -Os LUA_CFLAGS = -DLUA_USE_MACOSX LDFLAGS = -liconv -rdynamic MAKE = make @@ -358,12 +356,12 @@ release64: $(basedir).x86_64 tar czf /tmp/$<.tgz $< && rm -rf $< && gpg -ab /tmp/$<.tgz $(basedir).win32: ; hg archive $@ -X ".hg*" win32-release: $(basedir).win32 - make -j4 clean CROSS=i586-mingw32msvc- win32-deps + make -j4 clean win32-deps cp win32gtk/bin/*.dll $< && cp -r win32gtk/etc \ win32gtk/lib win32gtk/share $< rm -r $