[akhaldi] 49056: [CMAKE] - Improve some dlls. - Fix cmd and stlport. - Add libgcc as a C standard lib.
Author: akhaldi Date: Fri Oct 8 19:10:33 2010 New Revision: 49056
URL: http://svn.reactos.org/svn/reactos?rev=49056&view=rev Log: [CMAKE] - Improve some dlls. - Fix cmd and stlport. - Add libgcc as a C standard lib.
Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake
Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CMa... ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -75,4 +75,4 @@
add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -add_importlibs(cmd advapi32 user32 msvcrt) +add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32/... ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -46,7 +46,7 @@ ${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)
Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp/... ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -46,8 +46,8 @@ 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)
Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - -
add_definitions(-D__WINESRC__) add_definitions(-D_WINE) @@ -17,13 +15,11 @@ 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)
Modified: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/C... ============================================================================== --- branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32.... ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - -
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@
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)
Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -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 @@ 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)
Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree/... ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -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)
Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.a... ============================================================================== --- branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - -
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@
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)
Modified: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - -
include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,15 +11,11 @@ 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)
Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32.... ============================================================================== --- branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -1,5 +1,3 @@ - -
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) @@ -15,14 +13,12 @@
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)
Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32/... ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -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)
Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=4905... ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -18,7 +18,7 @@ add_definitions(-pipe -fms-extensions)
# stlport includes -set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport <FLAGS> -o <OBJECT> -c <SOURCE>") +set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlpo... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -4,7 +4,7 @@
add_definitions(-D_STLP_USE_EXCEPTIONS)
-include_directories(BEFORE ./stlport) +include_directories(BEFORE stlport)
list(APPEND SOURCE src/allocators.cpp
Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.... ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Oct 8 19:10:33 2010 @@ -32,7 +32,7 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -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 <OBJECT> ")
# 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")
-
akhaldi＠svn.reactos.org