From e617cbf7506f21bc95ca8d3e1b09c9b891982e43 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 29 Oct 2010 21:47:35 +0000 Subject: [PATCH] [CMAKE] Add dll/cpl and dll/3rdparty modules to build. svn path=/branches/cmake-bringup/; revision=49344 --- dll/3rdparty/CMakeLists.txt | 8 +++++--- dll/3rdparty/libtiff/CMakeLists.txt | 4 ++-- dll/3rdparty/mesa32/CMakeLists.txt | 20 ++++++++------------ dll/cpl/CMakeLists.txt | 4 ++-- dll/cpl/timedate/CMakeLists.txt | 4 +++- dll/cpl/timedate/lang/fr-FR.rc | 2 +- dll/cpl/usrmgr/CMakeLists.txt | 5 +++-- dll/win32/wshtcpip/CMakeLists.txt | 2 ++ 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dll/3rdparty/CMakeLists.txt b/dll/3rdparty/CMakeLists.txt index 0bff8a55327..3ad3d841682 100644 --- a/dll/3rdparty/CMakeLists.txt +++ b/dll/3rdparty/CMakeLists.txt @@ -1,7 +1,9 @@ -#add_subdirectory(dxtn)#disabled in trunk +if(NSWPAT) +add_subdirectory(dxtn) +endif() add_subdirectory(libjpeg) add_subdirectory(libpng) -#add_subdirectory(libtiff)#undefined reference to `_imp____argv' +add_subdirectory(libtiff) add_subdirectory(libxslt) -#add_subdirectory(mesa32)#FIXME +add_subdirectory(mesa32) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index fa070462649..0a8448db381 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -53,8 +53,8 @@ add_library(libtiff SHARED set_entrypoint(libtiff 0) -target_link_libraries(libtiff mingw_common zlib) +target_link_libraries(libtiff mingw_common zlib getopt) -add_importlibs(libtiff msvcrt getopt user32 kernel32) +add_importlibs(libtiff user32 msvcrt kernel32) add_dependencies(libtiff psdk buildno_header) diff --git a/dll/3rdparty/mesa32/CMakeLists.txt b/dll/3rdparty/mesa32/CMakeLists.txt index 53cf0da0881..f2a4c7bff02 100644 --- a/dll/3rdparty/mesa32/CMakeLists.txt +++ b/dll/3rdparty/mesa32/CMakeLists.txt @@ -1,15 +1,9 @@ add_definitions( - -DUSE_EXTERNAL_DXTN_LIB + -DUSE_EXTERNAL_DXTN_LIB=1 -DBUILD_GL32 -DWIN32 - -D_WINDOWS - -D_MBCS - -DHAVE_STAT - -DHAVE_WIN32_THREADS - -D_REENTRANT - -D_WINSOCKAPI_ - -DLIBXML_STATIC) + -D_WINDOWS) add_definitions(-D_DLL -D__USE_CRTIMP) @@ -22,7 +16,7 @@ else() add_definitions(-DGL_NO_STDCALL) endif(ARCH MATCHES i386) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi) @@ -261,12 +255,14 @@ add_library(mesa32 SHARED ${SOURCE}) set_entrypoint(mesa32 0) if (NOT MSVC) -set_target_properties(mesa32 PROPERTIES LINK_FLAGS "-Wl,-w") +# this hides all warnings, is this really wanted ? +#add_definitions(-w) + endif(NOT MSVC) -target_link_libraries(mesa32 ${CMAKE_CURRENT_BINARY_DIR}/src/drivers/windows/icd/mesa.def) +target_link_libraries(mesa32 ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/windows/icd/mesa.def) -add_importlibs(mesa32 gdi32 user32 ntdll) +add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll) add_dependencies(mesa32 psdk buildno_header) diff --git a/dll/cpl/CMakeLists.txt b/dll/cpl/CMakeLists.txt index 65e5eaaf82e..a81c845dcab 100644 --- a/dll/cpl/CMakeLists.txt +++ b/dll/cpl/CMakeLists.txt @@ -15,5 +15,5 @@ add_subdirectory(odbccp32) add_subdirectory(powercfg) add_subdirectory(sysdm) add_subdirectory(telephon) -#add_subdirectory(timedate)#FIXME: timedate\\/lang/fr-FR.rc:37: syntax error -#add_subdirectory(usrmgr)#\groups.c:436: error: 'LPNMLVDISPINFO' undeclared (first use in this function) +add_subdirectory(timedate) +add_subdirectory(usrmgr) diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index e7e629a0b58..e82bcce93cb 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -23,7 +23,9 @@ add_importlibs(timedate gdi32 comctl32 ws2_32 - iphlpapi) + iphlpapi + msvcrt + kernel32) add_dependencies(timedate timedate_def) add_livecd_target(timedate reactos/system32) diff --git a/dll/cpl/timedate/lang/fr-FR.rc b/dll/cpl/timedate/lang/fr-FR.rc index c6cbb53fb15..b72be0231ce 100644 --- a/dll/cpl/timedate/lang/fr-FR.rc +++ b/dll/cpl/timedate/lang/fr-FR.rc @@ -33,7 +33,7 @@ BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage ŕ l'heure d'été" + AUTOCHECKBOX "Ajuster automatiquement l'heure lors du &passage ŕ l'heure d'été", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt index 089fe2e161c..e2f2c5209ee 100644 --- a/dll/cpl/usrmgr/CMakeLists.txt +++ b/dll/cpl/usrmgr/CMakeLists.txt @@ -1,8 +1,7 @@ set_unicode() -add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(usrmgr ${CMAKE_CURRENT_SOURCE_DIR}/usrmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def) @@ -26,6 +25,8 @@ add_importlibs(usrmgr gdi32 comctl32 netapi32 + msvcrt + kernel32 ntdll) add_dependencies(usrmgr usrmgr_def) diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt index 17ae5661dc2..71158bd6616 100644 --- a/dll/win32/wshtcpip/CMakeLists.txt +++ b/dll/win32/wshtcpip/CMakeLists.txt @@ -15,3 +15,5 @@ target_link_libraries(wshtcpip add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip wshtcpip_def psdk buildno_header) + +add_livecd_target(wshtcpip reactos/system32) \ No newline at end of file