disable recent attempt to static link mingw DLL's causes errors for some users.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 10:05:24 +0000 (10:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 10:05:24 +0000 (10:05 +0000)
also remove break statement, mistake on last commit.

CMakeLists.txt
build_files/scons/config/win32-mingw-config.py
source/blender/blenloader/intern/readfile.c

index f584ad29f8c05c8e46081433d11f4269fe143d3c..f579cd9a20df5ad8189a1dd7cbfd929fa0fa9e76 100644 (file)
@@ -1029,8 +1029,9 @@ elseif(WIN32)
                
                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()
 
index 8894432e417b3e7574333e1007154a52d59373fd..9fac0a31029471608f116eb57014c0177b0b0256 100644 (file)
@@ -190,8 +190,9 @@ LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32
 
 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']
index 88cc908619bc1473cab86548d17bfca1ccc56b24..787a3f9357c2b46ba54405ac9acd746c8f5efdbd 100644 (file)
@@ -12875,7 +12875,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                                                 "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;
                                        }
                                }
                        }