diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-05 15:23:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-05 15:23:24 +0400 |
| commit | 348f116fe574ee38a70e8c9bdff7fc62ad1ec2e8 (patch) | |
| tree | 1052824afb1efc07da2e17ade92ee1a6ae16cf4a /CMakeLists.txt | |
| parent | 67db64bf818f9cc1dddbcef9dbb7213422d82feb (diff) | |
| parent | 7f555daa64d5e80f8d9dd2acf592d18dc8986309 (diff) | |
svn merge ^/trunk/blender -r43124:43160
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f64285314a6..dc514a28905 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1026,9 +1026,13 @@ elseif(WIN32) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) set(OPENIMAGEIO_DEFINITIONS) endif() - + set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152") + ## DISABLE - causes linking errors + ## for re-distrobution, so users dont need mingw installed + # set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++") + endif() # used in many places so include globally, like OpenGL |