Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-19 09:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
Add dll/cpl and dll/3rdparty modules to build.

svn path=/branches/cmake-bringup/; revision=49344
This commit is contained in:
Sylvain Petreolle 2010-10-29 21:47:35 +00:00
parent 52fa287f57
commit e617cbf750
8 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/3rdparty/CMakeLists.txt vendored
View file

@ -1,7 +1,9 @@
#add_subdirectory(dxtn)#disabled in trunk if(NSWPAT)
add_subdirectory(dxtn)
endif()
add_subdirectory(libjpeg) add_subdirectory(libjpeg)
add_subdirectory(libpng) add_subdirectory(libpng)
#add_subdirectory(libtiff)#undefined reference to `_imp____argv' add_subdirectory(libtiff)
add_subdirectory(libxslt) add_subdirectory(libxslt)
#add_subdirectory(mesa32)#FIXME add_subdirectory(mesa32)

4
dll/3rdparty/libtiff/CMakeLists.txt vendored
View file

@ -53,8 +53,8 @@ add_library(libtiff SHARED
set_entrypoint(libtiff 0) 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) add_dependencies(libtiff psdk buildno_header)

20
dll/3rdparty/mesa32/CMakeLists.txt vendored
View file

@ -1,15 +1,9 @@
add_definitions( add_definitions(
-DUSE_EXTERNAL_DXTN_LIB -DUSE_EXTERNAL_DXTN_LIB=1
-DBUILD_GL32 -DBUILD_GL32
-DWIN32 -DWIN32
-D_WINDOWS -D_WINDOWS)
-D_MBCS
-DHAVE_STAT
-DHAVE_WIN32_THREADS
-D_REENTRANT
-D_WINSOCKAPI_
-DLIBXML_STATIC)
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D_DLL -D__USE_CRTIMP)
@ -22,7 +16,7 @@ else()
add_definitions(-DGL_NO_STDCALL) add_definitions(-DGL_NO_STDCALL)
endif(ARCH MATCHES i386) 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)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi)
@ -261,12 +255,14 @@ add_library(mesa32 SHARED ${SOURCE})
set_entrypoint(mesa32 0) set_entrypoint(mesa32 0)
if (NOT MSVC) 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) 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) add_dependencies(mesa32 psdk buildno_header)

4
dll/cpl/CMakeLists.txt
View file

@ -15,5 +15,5 @@ add_subdirectory(odbccp32)
add_subdirectory(powercfg) add_subdirectory(powercfg)
add_subdirectory(sysdm) add_subdirectory(sysdm)
add_subdirectory(telephon) add_subdirectory(telephon)
#add_subdirectory(timedate)#FIXME: timedate\\/lang/fr-FR.rc:37: syntax error add_subdirectory(timedate)
#add_subdirectory(usrmgr)#\groups.c:436: error: 'LPNMLVDISPINFO' undeclared (first use in this function) add_subdirectory(usrmgr)

4
dll/cpl/timedate/CMakeLists.txt
View file

@ -23,7 +23,9 @@ add_importlibs(timedate
gdi32 gdi32
comctl32 comctl32
ws2_32 ws2_32
iphlpapi) iphlpapi
msvcrt
kernel32)
add_dependencies(timedate timedate_def) add_dependencies(timedate timedate_def)
add_livecd_target(timedate reactos/system32) add_livecd_target(timedate reactos/system32)

2
dll/cpl/timedate/lang/fr-FR.rc
View file

@ -33,7 +33,7 @@ BEGIN
COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136,
CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE 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 IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP
END END

5
dll/cpl/usrmgr/CMakeLists.txt
View file

@ -1,8 +1,7 @@
set_unicode() set_unicode()
add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(usrmgr ${CMAKE_CURRENT_SOURCE_DIR}/usrmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def) spec2def(usrmgr ${CMAKE_CURRENT_SOURCE_DIR}/usrmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
@ -26,6 +25,8 @@ add_importlibs(usrmgr
gdi32 gdi32
comctl32 comctl32
netapi32 netapi32
msvcrt
kernel32
ntdll) ntdll)
add_dependencies(usrmgr usrmgr_def) add_dependencies(usrmgr usrmgr_def)

2
dll/win32/wshtcpip/CMakeLists.txt
View file

@ -15,3 +15,5 @@ target_link_libraries(wshtcpip
add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_importlibs(wshtcpip ws2_32 kernel32 ntdll)
add_dependencies(wshtcpip wshtcpip_def psdk buildno_header) add_dependencies(wshtcpip wshtcpip_def psdk buildno_header)
add_livecd_target(wshtcpip reactos/system32)