- Improve some dlls.
- Fix cmd and stlport.
- Add libgcc as a C standard lib.
svn path=/branches/cmake-bringup/; revision=49056
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
${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)
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)
-
-
add_definitions(-D__WINESRC__)
add_definitions(-D_WINE)
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)
-
-
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)
-
-
add_definitions(-D_DLL -D__USE_CRTIMP)
add_definitions(-D__WINESRC__)
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)
-
-
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)
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)
-
-
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)
-
-
add_definitions(-D_DLL -D__USE_CRTIMP)
add_definitions(-D__WINESRC__)
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)
-
-
include_directories(include)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
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)
-
-
add_definitions(-D_DLL -D__USE_CRTIMP)
add_definitions(-D__WINESRC__)
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)
-
-
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)
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>")
add_definitions(-D_STLP_USE_EXCEPTIONS)
-include_directories(BEFORE ./stlport)
+include_directories(BEFORE stlport)
list(APPEND SOURCE
src/allocators.cpp
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")