Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

disable recent attempt to static link mingw DLL's causes errors for some users.

Browse Source 
also remove break statement, mistake on last commit.
This commit is contained in:
Campbell Barton
2012-01-05 10:05:24 +00:00
parent 05436e9a45
commit 8a9650e620
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View 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()

5
build_files/scons/config/win32-mingw-config.py
View 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']

1
source/blender/blenloader/intern/readfile.c
View 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;
}
}
}