- More work on import lib targets and improving modules.
svn path=/branches/cmake-bringup/; revision=49914
+
spec2def(ksproxy.ax ksproxy.spec)
add_definitions(-D_DLL -D__USE_CRTIMP)
- include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
- add_definitions(
+add_definitions(
-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
-DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
+
add_library(ksproxy SHARED
allocator.cpp
basicaudio.cpp
#set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif(MSVC)
-
target_link_libraries(ksproxy
- stlport -lsupc++ -lgcc
+ stlport -lsupc++ -lgcc -lmingw32 -lcoldname
strmiids)
add_importlibs(ksproxy
- mingw32
- coldname
advapi32
ole32
setupapi
add_dependencies(ksproxy psdk buildno_header)
-add_cab_target(ksproxy 1)
\ No newline at end of file
+add_cab_target(ksproxy 1)
advapi32.rc
${CMAKE_CURRENT_BINARY_DIR}/advapi32.def)
-if(NOT MSVC)
- set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
-
add_library(advapi32 SHARED
${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch
${SOURCE})
add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE})
add_cab_target(advapi32 1)
-add_importlib_target(advapi32.spec libntdll)
-
+add_importlib_target(advapi32.spec)
+
set_unicode()
set_cpp()
${REACTOS_SOURCE_DIR}/lib/atl)
set_rc_compiler()
+
spec2def(browseui.dll browseui.spec)
list(APPEND SOURCE
target_link_libraries(browseui
atlnew
uuid
- wine)
+ wine
+ -lmingw32
+ -lcoldname)
add_importlibs(browseui
- mingw32
- coldname
shlwapi
shell32
comctl32
target_link_libraries(cabinet wine)
add_importlibs(cabinet kernel32 ntdll)
+add_importlib_target(cabinet.spec)
+
add_dependencies(cabinet psdk buildno_header)
add_cab_target(cabinet 1)
-add_definitions(-D__WINESRC__)
-add_definitions(-D_WINE)
+add_definitions(
+ -D__WINESRC__
+ -D_WINE)
+
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
+
spec2def(cryptui.dll cryptui.spec)
list(APPEND SOURCE
kernel32
ntdll)
+add_importlib_target(cryptui.spec)
add_cab_target(cryptui 1)
add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
+add_importlib_target(dbghelp.spec)
+
add_cab_target(dbghelp 1)
set_module_type(dhcpcsvc win32dll)
-
-
add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
+add_importlib_target(dhcpcsvc.spec)
+
add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE})
add_cab_target(dhcpcsvc 1)
-add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+ -D__WINESRC__
+ -D_DLL -D__USE_CRTIMP)
+
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
+
spec2def(gdiplus.dll gdiplus.spec)
list(APPEND SOURCE
set_module_type(gdiplus win32dll)
-target_link_libraries(gdiplus
- uuid
- wine)
+target_link_libraries(gdiplus uuid wine)
add_importlibs(gdiplus
msvcrt
kernel32
ntdll)
+add_importlib_target(gdiplus.spec)
+
if(ARCH MATCHES amd64)
target_link_libraries(gdiplus crt)
endif(ARCH MATCHES amd64)
-
add_cab_target(gdiplus 1)
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-D_IMAGEHLP_SOURCE_)
+add_definitions(
+ -D_DLL -D__USE_CRTIMP
+ -D_IMAGEHLP_SOURCE_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
target_link_libraries(imagehlp wine)
add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
+add_importlib_target(imagehlp.spec)
+
add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
add_cab_target(imagehlp 1)
spec2def(iphlpapi.dll iphlpapi.spec)
-add_library(iphlpapi SHARED
+list(APPEND SOURCE
dhcp_reactos.c
ifenum_reactos.c
ipstats_reactos.c
iphlpapi.rc
${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
+add_library(iphlpapi SHARED ${SOURCE})
+
set_module_type(iphlpapi win32dll)
-target_link_libraries(iphlpapi
- wine
- tdilib)
+target_link_libraries(iphlpapi wine tdilib)
add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
add_definitions(-D__WINESRC__)
+
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
+
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(mlang.dll mlang.spec)
set_entrypoint(mlang 0)
-target_link_libraries(mlang
- uuid
- wine)
+target_link_libraries(mlang uuid wine)
add_importlibs(mlang
ole32
kernel32
ntdll)
+add_importlib_target(mlang.spec)
+
add_dependencies(mlang psdk buildno_header)
-add_cab_target(mlang 1)
\ No newline at end of file
+add_cab_target(mlang 1)
spec2def(mscoree.dll mscoree.spec)
-add_library(mscoree SHARED corruntimehost.c mscoree_main.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
+list(APPEND SOURCE
+ corruntimehost.c
+ mscoree_main.c
+ ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
+
+add_library(mscoree SHARED ${SOURCE})
set_module_type(mscoree win32dll)
-target_link_libraries(mscoree
- wine
- uuid)
+target_link_libraries(mscoree wine uuid)
add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll)
spec2def(msvcrt40.dll msvcrt40.spec)
-add_library(msvcrt40 SHARED msvcrt40.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
+list(APPEND SOURCE
+ msvcrt40.c
+ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
+
+add_library(msvcrt40 SHARED ${SOURCE})
set_module_type(msvcrt40 win32dll)
${PSEH_LIB})
add_importlibs(psapi msvcrt kernel32 ntdll)
+add_importlib_target(psapi.spec)
+
add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
add_cab_target(psapi 1)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+spec2def(riched20.dll riched20.spec)
+
add_library(riched20 SHARED
caret.c
clipboard.c
wrap.c
writer.c
version.rc
- riched20.def)
-
-if(NOT MSVC)
- set_source_files_properties(riched20.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+ ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
set_module_type(riched20 win32dll)
-target_link_libraries(riched20
- wine
- uuid)
+target_link_libraries(riched20 wine uuid)
if(MSVC)
set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
kernel32
ntdll)
+add_importlib_target(riched20.spec)
+
add_cab_target(riched20 1)
target_link_libraries(spoolss wine)
add_importlibs(spoolss winspool msvcrt kernel32 ntdll)
+add_importlib_target(spoolss.spec)
add_cab_target(spoolss 1)
-add_library(ufatx SHARED ufatx.rc ufatx.def)
+spec2def(ufatx.dll ufatx.spec)
-if(NOT MSVC)
- set_source_files_properties(ufatx.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(ufatx SHARED
+ ufatx.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
set_entrypoint(ufatx 0)
-target_link_libraries(ufatx vfatxlib)
+target_link_libraries(ufatx vfatxlib -lgcc)
+
+add_importlibs(ufatx kernel32 ntdll)
+add_importlib_target(ufatx.spec)
-add_importlibs(ufatx gcc kernel32 ntdll)
add_dependencies(ufatx psdk buildno_header)
-add_cab_target(ufatx 1)
\ No newline at end of file
+add_cab_target(ufatx 1)
target_link_libraries(usp10 wine)
add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll)
+add_importlib_target(usp10.spec)
add_cab_target(usp10 1)
set_module_type(windowscodecs win32dll)
-target_link_libraries(windowscodecs wine)
+target_link_libraries(windowscodecs wine uuid)
-add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
+add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
+add_importlib_target(windowscodecs.spec)
add_cab_target(windowscodecs 1)
set_module_type(dxgthk kernelmodedriver)
add_importlibs(dxgthk win32k)
-add_cab_target(dxgthk 2)
\ No newline at end of file
+add_importlib_target(dxgthk.spec)
+
+add_cab_target(dxgthk 2)