From fc5ac84ba522abbd7fb3b8fac6c2468bcd00eb11 Mon Sep 17 00:00:00 2001 From: Sir Richard Date: Wed, 4 Aug 2010 14:42:05 +0000 Subject: [PATCH] [CMAKE]: Don't prefix DLLs with "lib". [CMAKE]: Add our libgcc by default. svn path=/branches/cmake-bringup/; revision=48458 --- CMakeLists.txt | 1 + toolchain-mingw32.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c31bbeb61c..cda8b42059a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ include(CMakeMacros.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) +set(CMAKE_SHARED_LIBRARY_PREFIX "") add_definitions(-D__REACTOS__) diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake index 4f4b7aa0f78..b9fa62b0885 100644 --- a/toolchain-mingw32.cmake +++ b/toolchain-mingw32.cmake @@ -21,7 +21,7 @@ SET(CMAKE_ASM_COMPILE_OBJECT " -x assembler-with-cpp -o -O coff -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_BINARY_DIR}/include/reactos -i -o -DRC_INVOKED") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "") # We should add the environment libgcc here +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc") # We should add the environment libgcc here SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-stdcall-fixup -Wl,--kill-at -nodefaultlibs -nostdlib") # adjust the default behaviour of the FIND_XXX() commands: