forked from bartvdbraak/blender
Fix #22772: remove unnecessary -fpascal-strings flag on OS X, only
some debug code in webplugin needed it.
This commit is contained in:
parent
efb58cdab9
commit
f65c15cd5a
@ -279,9 +279,9 @@ else:
|
|||||||
|
|
||||||
CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
|
CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
|
||||||
|
|
||||||
CPPFLAGS = ['-fpascal-strings']+ARCH_FLAGS
|
CPPFLAGS = []+ARCH_FLAGS
|
||||||
CCFLAGS = ['-pipe','-funsigned-char','-fpascal-strings']+ARCH_FLAGS
|
CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
|
||||||
CXXFLAGS = ['-pipe','-funsigned-char', '-fpascal-strings']+ARCH_FLAGS
|
CXXFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
|
||||||
|
|
||||||
if WITH_GHOST_COCOA==True:
|
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
|
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
|
||||||
|
@ -49,10 +49,6 @@ CPPFLAGS += -I../Ketsji
|
|||||||
|
|
||||||
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
|
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
|
||||||
|
|
||||||
ifeq ($(OS),darwin)
|
|
||||||
CPPFLAGS += -fpascal-strings
|
|
||||||
endif
|
|
||||||
|
|
||||||
###############
|
###############
|
||||||
|
|
||||||
SOURCEDIR = source/gameengine/Rasterizer
|
SOURCEDIR = source/gameengine/Rasterizer
|
||||||
|
@ -51,7 +51,3 @@ CPPFLAGS += -I../../SceneGraph
|
|||||||
CPPFLAGS += -I..
|
CPPFLAGS += -I..
|
||||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||||
|
|
||||||
ifeq ($(OS),darwin)
|
|
||||||
CPPFLAGS += -fpascal-strings
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ ifeq ($(OS),darwin)
|
|||||||
REL_CCFLAGS += -O2
|
REL_CCFLAGS += -O2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CPPFLAGS += -D_THREAD_SAFE -fpascal-strings
|
CPPFLAGS += -D_THREAD_SAFE
|
||||||
|
|
||||||
ifeq ($(WITH_COCOA), true)
|
ifeq ($(WITH_COCOA), true)
|
||||||
CPPFLAGS += -DGHOST_COCOA
|
CPPFLAGS += -DGHOST_COCOA
|
||||||
|
Loading…
Reference in New Issue
Block a user