diff options
author | Kent Mein <mein@cs.umn.edu> | 2007-08-31 20:16:33 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2007-08-31 20:16:33 +0400 |
commit | 6cd6bf7d806f7edf17ec341d197a5c54bbdcaa73 (patch) | |
tree | f3d3941c1279eb4e3d475593a836ef49bb463d55 /source | |
parent | 6e91048bff139fba671a636e59ad99471658b3d8 (diff) |
Updated the Makefiles removing some of the gcc specific stuff...
Basically I moved -funsigned-char -fno-strict-aliasing
from individual Makefiles to nan_compile.mk defines for CFLAGS and CCFLAGS
Kent
Diffstat (limited to 'source')
26 files changed, 20 insertions, 118 deletions
diff --git a/source/blender/blenkernel/bad_level_call_stubs/Makefile b/source/blender/blenkernel/bad_level_call_stubs/Makefile index 2d98ea5a1af..1d4db1037ea 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/Makefile +++ b/source/blender/blenkernel/bad_level_call_stubs/Makefile @@ -39,10 +39,6 @@ include nan_compile.mk CFLAGS += $(LEVEL_2_C_WARNINGS) CFLAGS += $(FIX_STUBS_WARNINGS) -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../include diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 1d16ebfd4cd..72fcc466de8 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd openbsd linux solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) # OpenGL and Python diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index 0c3f4a486be..68148a1eb37 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - # CPPFLAGS += $(LEVEL_2_CPP_WARNINGS) # path to SDNA types diff --git a/source/blender/blenloader/intern/Makefile b/source/blender/blenloader/intern/Makefile index 86ccd607d63..4fcb0e8db47 100644 --- a/source/blender/blenloader/intern/Makefile +++ b/source/blender/blenloader/intern/Makefile @@ -38,10 +38,6 @@ include nan_compile.mk # CFLAGS += $(LEVEL_2_C_WARNINGS) -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - # OpenGL and Python CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) diff --git a/source/blender/blenpluginapi/intern/Makefile b/source/blender/blenpluginapi/intern/Makefile index 00052d36cfd..e493ea40aa5 100644 --- a/source/blender/blenpluginapi/intern/Makefile +++ b/source/blender/blenpluginapi/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris")) CFLAGS += -shared endif diff --git a/source/blender/ftfont/intern/Makefile b/source/blender/ftfont/intern/Makefile index a9ac8067164..064ec5dc597 100644 --- a/source/blender/ftfont/intern/Makefile +++ b/source/blender/ftfont/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/ftfont include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) #CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 29332747a31..09eb487b3a6 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -51,10 +51,6 @@ ifeq ($(WITH_DDS), true) CPPFLAGS += -DWITH_DDS endif -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_JPEG)/include diff --git a/source/blender/imbuf/intern/cineon/Makefile b/source/blender/imbuf/intern/cineon/Makefile index 596a6647093..e61c8dd59ed 100644 --- a/source/blender/imbuf/intern/cineon/Makefile +++ b/source/blender/imbuf/intern/cineon/Makefile @@ -38,10 +38,6 @@ SOURCEDIR = source/blender/imbuf/intern/cineon include nan_compile.mk include nan_definitions.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_JPEG)/include diff --git a/source/blender/imbuf/intern/dds/Makefile b/source/blender/imbuf/intern/dds/Makefile index 2bab1de1fc4..88d59080a47 100644 --- a/source/blender/imbuf/intern/dds/Makefile +++ b/source/blender/imbuf/intern/dds/Makefile @@ -38,10 +38,6 @@ SOURCEDIR = source/blender/imbuf/intern/dds include nan_compile.mk include nan_definitions.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_JPEG)/include diff --git a/source/blender/imbuf/intern/openexr/Makefile b/source/blender/imbuf/intern/openexr/Makefile index 65b9a058e01..a3b79c951dd 100644 --- a/source/blender/imbuf/intern/openexr/Makefile +++ b/source/blender/imbuf/intern/openexr/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/imbuf/openexr include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../../../makesdna diff --git a/source/blender/makesdna/intern/Makefile b/source/blender/makesdna/intern/Makefile index 84d854064d7..bd498961e7a 100644 --- a/source/blender/makesdna/intern/Makefile +++ b/source/blender/makesdna/intern/Makefile @@ -38,10 +38,6 @@ ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)makesdna $(DIR)/$(SHARED_DIR)$(DEBUG_DIR include nan_compile.mk -ifneq ($(OS),irix) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) diff --git a/source/blender/nodes/intern/CMP_nodes/Makefile b/source/blender/nodes/intern/CMP_nodes/Makefile index f4de13f2825..036812548b4 100644 --- a/source/blender/nodes/intern/CMP_nodes/Makefile +++ b/source/blender/nodes/intern/CMP_nodes/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd openbsd linux solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../../../blenkernel diff --git a/source/blender/nodes/intern/Makefile b/source/blender/nodes/intern/Makefile index d4053f13f6e..bae9a8dcf1d 100644 --- a/source/blender/nodes/intern/Makefile +++ b/source/blender/nodes/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd openbsd linux solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../../blenkernel diff --git a/source/blender/nodes/intern/SHD_nodes/Makefile b/source/blender/nodes/intern/SHD_nodes/Makefile index 46e297bce46..6344af4a5cb 100644 --- a/source/blender/nodes/intern/SHD_nodes/Makefile +++ b/source/blender/nodes/intern/SHD_nodes/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd openbsd linux solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../../../blenkernel diff --git a/source/blender/python/api2_2x/Makefile b/source/blender/python/api2_2x/Makefile index 159b535d678..8a13adae989 100644 --- a/source/blender/python/api2_2x/Makefile +++ b/source/blender/python/api2_2x/Makefile @@ -38,11 +38,6 @@ CSRCS ?= $(wildcard *.c) $(wildcard ../*.c) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char - CFLAGS += -fno-strict-aliasing -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) ifeq ($(WITH_FFMPEG), true) diff --git a/source/blender/radiosity/intern/source/Makefile b/source/blender/radiosity/intern/source/Makefile index 54a3af8e098..7791866eeaa 100644 --- a/source/blender/radiosity/intern/source/Makefile +++ b/source/blender/radiosity/intern/source/Makefile @@ -37,10 +37,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) diff --git a/source/blender/readblenfile/intern/Makefile b/source/blender/readblenfile/intern/Makefile index 6c6683eb07d..fa9875b8403 100644 --- a/source/blender/readblenfile/intern/Makefile +++ b/source/blender/readblenfile/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_2_C_WARNINGS) # path to our own external headerfiles diff --git a/source/blender/readblenfile/stub/Makefile b/source/blender/readblenfile/stub/Makefile index c5a9570522f..ed96e56b8af 100644 --- a/source/blender/readblenfile/stub/Makefile +++ b/source/blender/readblenfile/stub/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_2_C_WARNINGS) CFLAGS += $(FIX_STUBS_WARNINGS) diff --git a/source/blender/readblenfile/test/Makefile b/source/blender/readblenfile/test/Makefile index 2d7b7c7fff8..235abad36b5 100644 --- a/source/blender/readblenfile/test/Makefile +++ b/source/blender/readblenfile/test/Makefile @@ -37,10 +37,6 @@ ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)test$(EXT) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_2_C_WARNINGS) # path to our own external headerfiles diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile index f9b3dfc482a..95835f212e8 100644 --- a/source/blender/render/intern/source/Makefile +++ b/source/blender/render/intern/source/Makefile @@ -36,11 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char - CCFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) # first /include is my own includes, second is the external interface. diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index ac3ee291e9d..d8f053d7766 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -50,10 +50,6 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) #CFLAGS += $(LEVEL_1_C_WARNINGS) -diag_error 1196 -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - # PreProcessor stuff ------------------------------------------ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) diff --git a/source/blender/verify/intern/Makefile b/source/blender/verify/intern/Makefile index 74430193c79..c05f035caf2 100644 --- a/source/blender/verify/intern/Makefile +++ b/source/blender/verify/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/blender/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_2_C_WARNINGS) # path to our own external headerfiles diff --git a/source/blender/yafray/intern/Makefile b/source/blender/yafray/intern/Makefile index a00a1fed73f..f7f6ccb559f 100644 --- a/source/blender/yafray/intern/Makefile +++ b/source/blender/yafray/intern/Makefile @@ -33,10 +33,6 @@ DIR = $(OCGDIR)/blender/yafray include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/creator/Makefile b/source/creator/Makefile index f68855af96f..02c22aa4da8 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -38,10 +38,6 @@ CSRCS = creator.c include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I../blender/render/extern/include diff --git a/source/kernel/gen_messaging/intern/Makefile b/source/kernel/gen_messaging/intern/Makefile index cd6afa19a3f..8b204800650 100644 --- a/source/kernel/gen_messaging/intern/Makefile +++ b/source/kernel/gen_messaging/intern/Makefile @@ -36,10 +36,6 @@ DIR = $(OCGDIR)/kernel/$(LIBNAME) include nan_compile.mk -ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows")) - CFLAGS += -funsigned-char -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) # path to our own external headerfiles diff --git a/source/nan_compile.mk b/source/nan_compile.mk index d356d13be42..ae2717e3b5c 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -65,8 +65,8 @@ DBG_CCFLAGS += -g ifeq ($(OS),beos) CC = gcc CCC = g++ - CFLAGS += -pipe -fPIC - CFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing REL_CFLAGS += -O2 REL_CCFLAGS += -O2 NAN_DEPEND = true @@ -81,11 +81,11 @@ ifeq ($(OS),darwin) CC = gcc CCC = g++ ifeq ($(CPU),powerpc) - CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=G5 -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing else - CFLAGS += -pipe -fPIC -ffast-math -march=pentium-m - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing endif REL_CFLAGS += -O2 REL_CCFLAGS += -O2 @@ -103,8 +103,8 @@ ifeq ($(OS),freebsd) CCC = g++ JAVAC = javac JAVAH = javah - CFLAGS += -pipe -fPIC - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing REL_CFLAGS += -O2 REL_CCFLAGS += -O2 CPPFLAGS += -D_THREAD_SAFE @@ -140,8 +140,8 @@ ifeq ($(OS),linux) CC = gcc CCC = g++ # CFLAGS += -pipe - CFLAGS += -pipe -fPIC - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing # CCFLAGS += -pipe REL_CFLAGS += -O2 REL_CCFLAGS += -O2 @@ -158,8 +158,8 @@ endif ifeq ($(OS),openbsd) CC = gcc CCC = g++ - CFLAGS += -pipe -fPIC - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing REL_CFLAGS += -O2 REL_CCFLAGS += -O2 NAN_DEPEND = true @@ -173,10 +173,14 @@ endif ifeq ($(OS),solaris) CC = gcc CCC = g++ +# CC = cc +# CCC = CC JAVAC = javac JAVAH = javah - CFLAGS += -pipe -fPIC - CCFLAGS += -pipe -fPIC + CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing +# CFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned" +# CCFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned" REL_CFLAGS += -O1 REL_CCFLAGS += -O1 NAN_DEPEND = true @@ -197,8 +201,8 @@ ifeq ($(OS),windows) ifeq ($(FREE_WINDOWS),true) CC = gcc CCC = g++ - CFLAGS += -pipe -mno-cygwin -mwindows - CCFLAGS += -pipe -mno-cygwin -mwindows + CFLAGS += -pipe -mno-cygwin -mwindows -funsigned-char -fno-strict-aliasing + CCFLAGS += -pipe -mno-cygwin -mwindows -funsigned-char -fno-strict-aliasing CPPFLAGS += -DFREE_WINDOWS REL_CFLAGS += -O2 REL_CCFLAGS += -O2 |