Revision: 30084
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30084
Author: blendix
Date: 2010-07-07 17:26:02 +0200 (Wed, 07 Jul 2010)
Log Message:
-----------
Fix #22772: remove unnecessary -fpascal-strings flag on OS X, only
some debug code in webplugin needed it.
Modified Paths:
--------------
trunk/blender/config/darwin-config.py
trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
trunk/blender/source/gameengine/Rasterizer/Makefile
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
trunk/blender/source/nan_compile.mk
Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py 2010-07-07 15:24:06 UTC (rev
30083)
+++ trunk/blender/config/darwin-config.py 2010-07-07 15:26:02 UTC (rev
30084)
@@ -279,9 +279,9 @@
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
Modified: trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
2010-07-07 15:24:06 UTC (rev 30083)
+++ trunk/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
2010-07-07 15:26:02 UTC (rev 30084)
@@ -85,7 +85,7 @@
#define PLUGIN_TRACE 0
#if PLUGIN_TRACE
-#define PLUGINDEBUGSTR(msg) ::DebugStr(msg)
+#define PLUGINDEBUGSTR(msg) fprintf(stderr, msg)
#else
#define PLUGINDEBUGSTR
#endif
@@ -293,7 +293,7 @@
{
NPError err;
EnterCodeResource();
- PLUGINDEBUGSTR("\pInitialize;g;");
+ PLUGINDEBUGSTR("Initialize;g;");
err = NPP_Initialize();
ExitCodeResource();
return err;
@@ -302,7 +302,7 @@
void Private_Shutdown(void)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pShutdown;g;");
+ PLUGINDEBUGSTR("Shutdown;g;");
NPP_Shutdown();
ExitCodeResource();
}
@@ -312,7 +312,7 @@
{
EnterCodeResource();
NPError ret = NPP_New(pluginType, instance, mode, argc, argn, argv,
saved);
- PLUGINDEBUGSTR("\pNew;g;");
+ PLUGINDEBUGSTR("New;g;");
ExitCodeResource();
return ret;
}
@@ -321,7 +321,7 @@
{
NPError err;
EnterCodeResource();
- PLUGINDEBUGSTR("\pDestroy;g;");
+ PLUGINDEBUGSTR("Destroy;g;");
err = NPP_Destroy(instance, save);
ExitCodeResource();
return err;
@@ -331,7 +331,7 @@
{
NPError err;
EnterCodeResource();
- PLUGINDEBUGSTR("\pSetWindow;g;");
+ PLUGINDEBUGSTR("SetWindow;g;");
err = NPP_SetWindow(instance, window);
ExitCodeResource();
return err;
@@ -341,7 +341,7 @@
{
NPError err;
EnterCodeResource();
- PLUGINDEBUGSTR("\pNewStream;g;");
+ PLUGINDEBUGSTR("NewStream;g;");
err = NPP_NewStream(instance, type, stream, seekable, stype);
ExitCodeResource();
return err;
@@ -351,7 +351,7 @@
{
int32 result;
EnterCodeResource();
- PLUGINDEBUGSTR("\pWriteReady;g;");
+ PLUGINDEBUGSTR("WriteReady;g;");
result = NPP_WriteReady(instance, stream);
ExitCodeResource();
return result;
@@ -361,7 +361,7 @@
{
int32 result;
EnterCodeResource();
- PLUGINDEBUGSTR("\pWrite;g;");
+ PLUGINDEBUGSTR("Write;g;");
result = NPP_Write(instance, stream, offset, len, buffer);
ExitCodeResource();
return result;
@@ -370,7 +370,7 @@
void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pStreamAsFile;g;");
+ PLUGINDEBUGSTR("StreamAsFile;g;");
NPP_StreamAsFile(instance, stream, fname);
ExitCodeResource();
}
@@ -380,7 +380,7 @@
{
NPError err;
EnterCodeResource();
- PLUGINDEBUGSTR("\pDestroyStream;g;");
+ PLUGINDEBUGSTR("DestroyStream;g;");
err = NPP_DestroyStream(instance, stream, reason);
ExitCodeResource();
return err;
@@ -390,7 +390,7 @@
{
int16 result;
EnterCodeResource();
- PLUGINDEBUGSTR("\pHandleEvent;g;");
+ PLUGINDEBUGSTR("HandleEvent;g;");
result = NPP_HandleEvent(instance, event);
ExitCodeResource();
return result;
@@ -399,7 +399,7 @@
void Private_Print(NPP instance, NPPrint* platformPrint)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pPrint;g;");
+ PLUGINDEBUGSTR("Print;g;");
NPP_Print(instance, platformPrint);
ExitCodeResource();
}
@@ -407,7 +407,7 @@
void Private_URLNotify(NPP instance, const char* url, NPReason reason, void*
notifyData)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pURLNotify;g;");
+ PLUGINDEBUGSTR("URLNotify;g;");
NPP_URLNotify(instance, url, reason, notifyData);
ExitCodeResource();
}
@@ -416,7 +416,7 @@
jref Private_GetJavaClass(void)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pGetJavaClass;g;");
+ PLUGINDEBUGSTR("GetJavaClass;g;");
jref clazz = NPP_GetJavaClass();
ExitCodeResource();
@@ -469,7 +469,7 @@
result = GetProcessInformation(&PSN, &infoRec);
if (result != noErr)
- PLUGINDEBUGSTR("\pFailed in GetProcessInformation");
+ PLUGINDEBUGSTR("Failed in GetProcessInformation");
}
else
//
@@ -500,7 +500,7 @@
SymClass symClass;
result = FindSymbol(connID, "\pqd", (Ptr*)&gQDPtr, &symClass);
if (result != noErr)
- PLUGINDEBUGSTR("\pFailed in FindSymbol qd");
+ PLUGINDEBUGSTR("Failed in FindSymbol qd");
}
else
{
@@ -525,7 +525,7 @@
NPError main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs,
NPP_ShutdownUPP* unloadUpp)
{
EnterCodeResource();
- PLUGINDEBUGSTR("\pmain");
+ PLUGINDEBUGSTR("main");
NPError err = NPERR_NO_ERROR;
Modified: trunk/blender/source/gameengine/Rasterizer/Makefile
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/Makefile 2010-07-07 15:24:06 UTC
(rev 30083)
+++ trunk/blender/source/gameengine/Rasterizer/Makefile 2010-07-07 15:26:02 UTC
(rev 30084)
@@ -49,10 +49,6 @@
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
-ifeq ($(OS),darwin)
- CPPFLAGS += -fpascal-strings
-endif
-
###############
SOURCEDIR = source/gameengine/Rasterizer
Modified:
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
2010-07-07 15:24:06 UTC (rev 30083)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
2010-07-07 15:26:02 UTC (rev 30084)
@@ -51,7 +51,3 @@
CPPFLAGS += -I..
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
-ifeq ($(OS),darwin)
- CPPFLAGS += -fpascal-strings
-endif
-
Modified: trunk/blender/source/nan_compile.mk
===================================================================
--- trunk/blender/source/nan_compile.mk 2010-07-07 15:24:06 UTC (rev 30083)
+++ trunk/blender/source/nan_compile.mk 2010-07-07 15:26:02 UTC (rev 30084)
@@ -101,7 +101,7 @@
REL_CCFLAGS += -O2
endif
- CPPFLAGS += -D_THREAD_SAFE -fpascal-strings
+ CPPFLAGS += -D_THREAD_SAFE
ifeq ($(WITH_COCOA), true)
CPPFLAGS += -DGHOST_COCOA
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
