Revision: 43158
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43158
Author: campbellbarton
Date: 2012-01-05 10:05:24 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
disable recent attempt to static link mingw DLL's causes errors for some users.
also remove break statement, mistake on last commit.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-01-05 09:50:07 UTC (rev 43157)
+++ trunk/blender/CMakeLists.txt 2012-01-05 10:05:24 UTC (rev 43158)
@@ -1029,8 +1029,9 @@
set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
- # for re-distrobution, so users dont need mingw installed
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc
-static-libstdc++")
+ ## DISABLE - causes linking errors
+ ## for re-distrobution, so users dont need mingw installed
+ # set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc
-static-libstdc++")
endif()
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py
2012-01-05 09:50:07 UTC (rev 43157)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py
2012-01-05 10:05:24 UTC (rev 43158)
@@ -190,8 +190,9 @@
PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
-# for re-distrobution, so users dont need mingw installed
-PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
+## DISABLED, causes linking errors!
+## for re-distrobution, so users dont need mingw installed
+# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
BF_DEBUG = False
BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-01-05
09:50:07 UTC (rev 43157)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-01-05
10:05:24 UTC (rev 43158)
@@ -12875,7 +12875,6 @@
"Game property
name conflict in object: \"%s\".\nText objects reserve the "
"[\"Text\"]
game property to change their content through Logic Bricks.\n",
ob->id.name+2);
- break;
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
