diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f584ad29f8c..f579cd9a20d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 8894432e417..9fac0a31029 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -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'] diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 88cc908619b..787a3f9357c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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; } } } |