zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Makefiles: fix handling of "-Wstrict-overflow=1" to fix Leopard 10.5/Xcode 3.1.4 compatibility

Browse source 
- osxbuild.sh: explicitly specify "ARCH='-arch x86_64'" for 64-bit builds

git-svn-id: https://svn.eduke32.com/eduke32@2444 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-11 07:11:59 +00:00
parent cdafeef732
commit 5f3000522a
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/eduke32/Makefile.common
View file

@ -147,20 +147,10 @@ else
W_NO_UNUSED_RESULT := W_NO_UNUSED_RESULT :=
endif endif
W_STRICT_OVERFLOW := -Wstrict-overflow=1
ifeq (3,$(GCC_MAJOR))
W_STRICT_OVERFLOW :=
endif
ifeq ($(PLATFORM),DARWIN)
ifeq (1,$(DARWIN9))
W_STRICT_OVERFLOW :=
endif
endif
BASECFLAGS=$(debug) -W -Wall -Wimplicit -Werror-implicit-function-declaration \ BASECFLAGS=$(debug) -W -Wall -Wimplicit -Werror-implicit-function-declaration \
-funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS -D_FORTIFY_SOURCE=2 \ -funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS -D_FORTIFY_SOURCE=2 \
$(F_JUMP_TABLES) $(W_NO_UNUSED_RESULT) $(ARCH) \ $(F_JUMP_TABLES) $(W_NO_UNUSED_RESULT) $(ARCH) \
-Wextra $(W_STRICT_OVERFLOW) #-Wwrite-strings -Waddress -Wlogical-op -Wextra #-Wwrite-strings -Waddress -Wlogical-op
ifeq ($(CC),clang) ifeq ($(CC),clang)
BASECFLAGS+= -Wno-unused-value -Wno-parentheses BASECFLAGS+= -Wno-unused-value -Wno-parentheses
endif endif

5
polymer/eduke32/build/Makefile.shared
View file

@ -30,9 +30,9 @@ ifeq (4,$(GCC_MAJOR))
M_TUNE_GENERIC := -mtune=generic M_TUNE_GENERIC := -mtune=generic
M_STACKREALIGN := -mstackrealign M_STACKREALIGN := -mstackrealign
L_SSP := -lssp L_SSP := -lssp
W_STRICT_OVERFLOW := -Wstrict-overflow=1
endif endif
ifndef ARCH ifndef ARCH
ifeq ($(findstring i686, $(shell uname -m)), i686) ifeq ($(findstring i686, $(shell uname -m)), i686)
ARCH=-march=pentium3 $(M_TUNE_GENERIC) -mmmx # -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN) ARCH=-march=pentium3 $(M_TUNE_GENERIC) -mmmx # -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN)
@ -109,6 +109,7 @@ ifeq ($(PLATFORM),DARWIN)
ifeq (1,$(DARWIN9)) ifeq (1,$(DARWIN9))
BUILDCFLAGS += -DDARWIN9 BUILDCFLAGS += -DDARWIN9
F_JUMP_TABLES := F_JUMP_TABLES :=
W_STRICT_OVERFLOW :=
endif endif
ifeq (1,$(BUILD32_ON_64)) ifeq (1,$(BUILD32_ON_64))
@ -207,7 +208,7 @@ else
endif endif
BUILDCFLAGS+= -DRENDERTYPE$(RENDERTYPE)=1 BUILDCFLAGS+= -DRENDERTYPE$(RENDERTYPE)=1 $(W_STRICT_OVERFLOW)
ifneq (0,$(USE_OPENGL)) ifneq (0,$(USE_OPENGL))
BUILDCFLAGS+= -DUSE_OPENGL BUILDCFLAGS+= -DUSE_OPENGL

4
polymer/eduke32/osxbuild.sh
View file

@ -81,7 +81,7 @@ if [ $onlyzip -eq 0 ]; then
if [ $build64 == 1 ]; then if [ $build64 == 1 ]; then
if [ $builddebug == 1 ]; then if [ $builddebug == 1 ]; then
make veryclean make veryclean
OSX_STARTUPWINDOW=1 WITHOUT_GTK=1 RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 ARCH='-arch x86_64' OSX_STARTUPWINDOW=1 WITHOUT_GTK=1 RELEASE=0 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3
if [ $? ]; then if [ $? ]; then
echo x86_64 debug build succeeded. echo x86_64 debug build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x64 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.debug.x64
@ -92,7 +92,7 @@ if [ $onlyzip -eq 0 ]; then
fi fi
make veryclean make veryclean
OSX_STARTUPWINDOW=1 WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3 ARCH='-arch x86_64' OSX_STARTUPWINDOW=1 WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3
if [ $? ]; then if [ $? ]; then
echo x86_64 release build succeeded. echo x86_64 release build succeeded.
cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x64 cp "Mapster32.app/Contents/MacOS/mapster32" mapster32.x64