From: Amine Khaldi Date: Fri, 8 Oct 2010 19:10:33 +0000 (+0000) Subject: [CMAKE] X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~756 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=da7764cd5c63b263158b70661faba45ea4769f6c [CMAKE] - Improve some dlls. - Fix cmd and stlport. - Add libgcc as a C standard lib. svn path=/branches/cmake-bringup/; revision=49056 --- diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index 4f89797db8e..93fe22546a8 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -75,4 +75,4 @@ target_link_libraries(cmd wine) add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -add_importlibs(cmd advapi32 user32 msvcrt) \ No newline at end of file +add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) \ No newline at end of file diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 1b05521adff..47e2662a0e0 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -46,7 +46,7 @@ target_link_libraries(crypt32 ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def wine pseh - mingw_common) + oldnames) -add_importlibs(crypt32 user32 advapi32 msvcrt) +add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(crypt32 crypt32_def) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 8cf02ca5261..41873d4e7f2 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -46,8 +46,8 @@ set_module_type(dbghelp win32dll) target_link_libraries(dbghelp ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def wine - mingw_common - pseh) + pseh + oldnames) -add_importlibs(dbghelp psapi version msvcrt) +add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) add_dependencies(dbghelp dbghelp_def) diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt index 2b341e1888a..fa1d99eed91 100644 --- a/dll/win32/mpr/CMakeLists.txt +++ b/dll/win32/mpr/CMakeLists.txt @@ -1,6 +1,4 @@ - - add_definitions(-D__WINESRC__) add_definitions(-D_WINE) @@ -17,13 +15,11 @@ add_library(mpr SHARED wnet.c mpr.rc) -set_target_properties(mpr PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mpr win32dll) target_link_libraries(mpr ${CMAKE_CURRENT_BINARY_DIR}/mpr.def - wine - mingw_common - -ladvapi32 - -luser32) + wine) -add_dependencies(mpr mpr_def psdk) +add_importlibs(mpr advapi32 user32 kernel32 ntdll) +add_dependencies(mpr mpr_def) diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index 986a1a7bb8c..b759171ec80 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mprapi ${CMAKE_CURRENT_SOURCE_DIR}/mprapi.spec ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) add_library(mprapi SHARED mprapi.c) -set_target_properties(mprapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mprapi win32dll) target_link_libraries(mprapi ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def - wine - mingw_common) + wine) -add_dependencies(mprapi mprapi_def psdk) +add_importlibs(mprapi kernel32 ntdll) +add_dependencies(mprapi mprapi_def) diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index a4f05417391..cacd867c5d9 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -1,6 +1,4 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_custom_target(msadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msadp3 add_library(msadp32.acm SHARED msadp32.c) -set_target_properties(msadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msadp32.acm 0) +set_target_properties(msadp32.acm PROPERTIES SUFFIX "") target_link_libraries(msadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msadp32.acm msadp32.acm_def psdk) +add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msadp32.acm msadp32.acm_def psdk buildno_header) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index e5ca94dc537..63d5ce32b4b 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscms ${CMAKE_CURRENT_SOURCE_DIR}/mscms.spec ${CMAKE_CURRENT_BINARY_DIR}/mscms.def) @@ -16,11 +13,11 @@ add_library(mscms SHARED transform.c version.rc) -set_target_properties(mscms PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mscms win32dll) target_link_libraries(mscms ${CMAKE_CURRENT_BINARY_DIR}/mscms.def - wine - mingw_common) + wine) -add_dependencies(mscms mscms_def psdk) +add_importlibs(mscms kernel32 ntdll) +add_dependencies(mscms mscms_def) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index d7e0bfa5906..d966a9e986c 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -1,22 +1,17 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscoree ${CMAKE_CURRENT_SOURCE_DIR}/mscoree.spec ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) add_library(mscoree SHARED corruntimehost.c mscoree_main.c) -set_target_properties(mscoree PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mscoree win32dll) target_link_libraries(mscoree ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def wine - mingw_common - -ladvapi32 - -lshell32 - -luuid) + uuid) -add_dependencies(mscoree mscoree_def psdk) +add_importlibs(mscoree advapi32 shell32 kernel32 ntdll) +add_dependencies(mscoree mscoree_def) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index 13186533452..e909b4c9c12 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -1,6 +1,4 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_custom_target(msg711.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msg711. add_library(msg711.acm SHARED msg711.c) -set_target_properties(msg711.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msg711.acm 0) +set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msg711.acm msg711.acm_def psdk) +add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msg711.acm msg711.acm_def psdk buildno_header) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index 696e621f87f..2a54bf3239c 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -1,6 +1,4 @@ - - include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,15 +11,11 @@ add_library(msgina SHARED tui.c msgina.rc) -set_target_properties(msgina PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msgina win32dll) target_link_libraries(msgina ${CMAKE_CURRENT_BINARY_DIR}/msgina.def - wine - mingw_common - -ladvapi32 - -luser32 - -lgdi32 - -luserenv) + wine) -add_dependencies(msgina msgina_def psdk) +add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll) +add_dependencies(msgina msgina_def) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index 07dda69f1a3..49e220ec9fb 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -1,6 +1,4 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@ add_custom_target(msgsm32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msgsm3 add_library(msgsm32.acm SHARED msgsm32.c) -set_target_properties(msgsm32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(msgsm32.acm 0) +set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") target_link_libraries(msgsm32.acm ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(msgsm32.acm msgsm32.acm_def psdk) +add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(msgsm32.acm msgsm32.acm_def psdk buildno_header) diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index 00ceeafc04b..c816a4440e1 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -1,20 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(msimg32 ${CMAKE_CURRENT_SOURCE_DIR}/msimg32.spec ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) add_library(msimg32 SHARED msimg32_main.c) -set_target_properties(msimg32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(msimg32 win32dll) target_link_libraries(msimg32 ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def - wine - mingw_common - -lgdi32) + wine) -add_dependencies(msimg32 msimg32_def psdk) +add_importlibs(msimg32 gdi32 kernel32 ntdll) +add_dependencies(msimg32 msimg32_def) diff --git a/gcc.cmake b/gcc.cmake index 5509e1859af..119876966ea 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -18,7 +18,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas add_definitions(-pipe -fms-extensions) # stlport includes -set(CMAKE_CXX_COMPILE_OBJECT " -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport -o -c ") +set(CMAKE_CXX_COMPILE_OBJECT " -o -c ") set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") diff --git a/lib/3rdparty/stlport/CMakeLists.txt b/lib/3rdparty/stlport/CMakeLists.txt index e618ce20a67..184604767b5 100644 --- a/lib/3rdparty/stlport/CMakeLists.txt +++ b/lib/3rdparty/stlport/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(-D_STLP_USE_EXCEPTIONS) -include_directories(BEFORE ./stlport) +include_directories(BEFORE stlport) list(APPEND SOURCE src/allocators.cpp diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake index a29da7ea2aa..6281b24d19d 100644 --- a/toolchain-mingw32.cmake +++ b/toolchain-mingw32.cmake @@ -32,7 +32,7 @@ SET(CMAKE_IDL_COMPILE_OBJECT " -m32 --win3 SET(CMAKE_RC_COMPILE_OBJECT " -i -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o ") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "Standard C Libraries") +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries")