dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the Makefiles removing some of the gcc specific stuff...

Browse Source 
Basically I moved  -funsigned-char -fno-strict-aliasing
from individual Makefiles to nan_compile.mk defines for CFLAGS and CCFLAGS

Kent
This commit is contained in:
Kent Mein
2007-08-31 16:16:33 +00:00
parent 6e91048bff
commit 6cd6bf7d80
26 changed files with 20 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/bad_level_call_stubs/Makefile
-4
View File
@@ -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
source/blender/blenkernel/intern/Makefile
-4
View File
@@ -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
source/blender/blenlib/intern/Makefile
-4
View File
@@ -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
source/blender/blenloader/intern/Makefile
-4
View File
@@ -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)
source/blender/blenpluginapi/intern/Makefile
-4
View File
@@ -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
source/blender/ftfont/intern/Makefile
-4
View File
@@ -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
source/blender/imbuf/intern/Makefile
-4
View File
@@ -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
source/blender/imbuf/intern/cineon/Makefile
-4
View File
@@ -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
source/blender/imbuf/intern/dds/Makefile
-4
View File
@@ -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
source/blender/imbuf/intern/openexr/Makefile
-4
View File
@@ -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
source/blender/makesdna/intern/Makefile
-4
View File
@@ -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)
source/blender/nodes/intern/CMP_nodes/Makefile
-4
View File
@@ -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
source/blender/nodes/intern/Makefile
-4
View File
@@ -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
source/blender/nodes/intern/SHD_nodes/Makefile
-4
View File
@@ -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
source/blender/python/api2_2x/Makefile
-5
View File
@@ -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)
source/blender/radiosity/intern/source/Makefile
-4
View File
@@ -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)
source/blender/readblenfile/intern/Makefile
-4
View File
@@ -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
source/blender/readblenfile/stub/Makefile
-4
View File
@@ -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)
source/blender/readblenfile/test/Makefile
-4
View File
@@ -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
source/blender/render/intern/source/Makefile
-5
View File
@@ -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.
source/blender/src/Makefile
-4
View File
@@ -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)
source/blender/verify/intern/Makefile
-4
View File
@@ -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
source/blender/yafray/intern/Makefile
-4
View File
@@ -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
source/creator/Makefile
-4
View File
@@ -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
source/kernel/gen_messaging/intern/Makefile
-4
View File
@@ -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
source/nan_compile.mk
+20 -16
View File
@@ -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