diff options
| -rw-r--r-- | Modules/Platform/Windows-bcc32.cmake | 4 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Modules/Platform/Windows-bcc32.cmake b/Modules/Platform/Windows-bcc32.cmake index 4ccd790..21648e4 100644 --- a/Modules/Platform/Windows-bcc32.cmake +++ b/Modules/Platform/Windows-bcc32.cmake @@ -8,9 +8,11 @@ SET(CMAKE_END_TEMP_FILE "\n|") #SET(CMAKE_START_TEMP_FILE "") #SET(CMAKE_END_TEMP_FILE "") #SET(CMAKE_VERBOSE_MAKEFILE 1) + + # create a shared C++ library SET(CMAKE_CXX_CREATE_SHARED_LIBRARY - "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD -tWR <LINK_LIBRARIES> <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}" + "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD <LINK_FLAGS> -tWR <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}" "implib ${CMAKE_START_TEMP_FILE}-w <TARGET_BASE>.lib <TARGET_BASE>.dll${CMAKE_END_TEMP_FILE}" ) diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 3c7eca1..fdb2234 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2223,11 +2223,6 @@ OutputBuildObjectFromSource(std::ostream& fout, } case cmSystemTools::CXX_FILE_FORMAT: { - if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"))) - { - flags += this->GetSafeDefinition("CMAKE_SHARED_BUILD_CXX_FLAGS"); - flags += " "; - } rules.push_back(m_Makefile->GetDefinition("CMAKE_CXX_COMPILE_OBJECT")); flags += this->GetSafeDefinition("CMAKE_CXX_FLAGS"); flags += " "; @@ -2243,6 +2238,11 @@ OutputBuildObjectFromSource(std::ostream& fout, flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_CXX_FLAGS"); flags += " "; } + if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS"))) + { + flags += this->GetSafeDefinition("CMAKE_SHARED_BUILD_CXX_FLAGS"); + flags += " "; + } break; } case cmSystemTools::HEADER_FILE_FORMAT: |