kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #22772: remove unnecessary -fpascal-strings flag on OS X, only

Browse Source 
some debug code in webplugin needed it.
This commit is contained in:
Brecht Van Lommel 2010-07-07 15:26:02 +00:00
parent efb58cdab9
commit f65c15cd5a
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/darwin-config.py
View File

@ -279,9 +279,9 @@ else:
CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
CPPFLAGS = ['-fpascal-strings']+ARCH_FLAGS
CCFLAGS = ['-pipe','-funsigned-char','-fpascal-strings']+ARCH_FLAGS
CXXFLAGS = ['-pipe','-funsigned-char', '-fpascal-strings']+ARCH_FLAGS
CPPFLAGS = []+ARCH_FLAGS
CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
CXXFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
if WITH_GHOST_COCOA==True:
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS

4
source/gameengine/Rasterizer/Makefile
View File

@ -49,10 +49,6 @@ CPPFLAGS += -I../Ketsji
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
ifeq ($(OS),darwin)
CPPFLAGS += -fpascal-strings
endif
###############
SOURCEDIR = source/gameengine/Rasterizer

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
View File

@ -51,7 +51,3 @@ CPPFLAGS += -I../../SceneGraph
CPPFLAGS += -I..
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
ifeq ($(OS),darwin)
CPPFLAGS += -fpascal-strings
endif

2
source/nan_compile.mk
View File

@ -101,7 +101,7 @@ ifeq ($(OS),darwin)
REL_CCFLAGS += -O2
endif
CPPFLAGS += -D_THREAD_SAFE -fpascal-strings
CPPFLAGS += -D_THREAD_SAFE
ifeq ($(WITH_COCOA), true)
CPPFLAGS += -DGHOST_COCOA