Commit 9b3d826b authored by Dick Hollenbeck's avatar Dick Hollenbeck

switch to static linking of libstdc++ on windows

parent 35b1b13f
...@@ -113,16 +113,7 @@ if( CMAKE_COMPILER_IS_GNUCXX ) ...@@ -113,16 +113,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
if( MINGW ) if( MINGW )
# Set default flags for Release build. set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
# Use a static link for libstdc++ reduce the starting time for Pcbnew (and eeschema)
# (10 times faster)
# This problem is caused by large relocation table and inefficient MinGW implementation
# see http://sourceforge.net/p/mingw/bugs/1747/ and also
# http://stackoverflow.com/questions/15310996/clang-slow-startup-using-mingw
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -static-libstdc++" )
# Set default flags for Debug build.
set( CMAKE_MODULE_LINKER_FLAGS "-static-libstdc++")
else() else()
# We build DLL/DSOs from static libraries, so create position independent code # We build DLL/DSOs from static libraries, so create position independent code
...@@ -274,9 +265,9 @@ include( download_boost ) ...@@ -274,9 +265,9 @@ include( download_boost )
# On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base # On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
if( APPLE ) if( APPLE )
find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET ) find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
else( APPLE ) else()
find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET ) find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET )
endif( APPLE ) endif()
check_find_package_result( wxWidgets_FOUND "wxWidgets" ) check_find_package_result( wxWidgets_FOUND "wxWidgets" )
......
...@@ -77,7 +77,7 @@ wxWidgets_USE_DEBUG to ON. ...@@ -77,7 +77,7 @@ wxWidgets_USE_DEBUG to ON.
wxWidgets_USE_UNICODE (ON/OFF) wxWidgets_USE_UNICODE (ON/OFF)
------------------------------ ------------------------------
If you platform supports Unicode and you wish to build KiCad with Unicode If your platform supports Unicode and you wish to build KiCad with Unicode
support, set wxWidgets_USE_UNICODE to ON. Please note as of the 2.9 branch support, set wxWidgets_USE_UNICODE to ON. Please note as of the 2.9 branch
this option is not required. this option is not required.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment