[ros-diffs] [tkreuzer] 49833: [CMAKE] - Link libxslt to ntdll for MSVC - Don't compile some directx stuff with MSVC atm - Add importlib target for dinput - add importlib target for wined3d and use autogenerate...

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Nov 28 01:24:36 UTC 2010


Author: tkreuzer
Date: Sun Nov 28 01:24:36 2010
New Revision: 49833

URL: http://svn.reactos.org/svn/reactos?rev=49833&view=rev
Log:
[CMAKE]
- Link libxslt to ntdll for MSVC
- Don't compile some directx stuff with MSVC atm
- Add importlib target for dinput
- add importlib target for wined3d and use autogenerated def
- Improve quartz

Modified:
    branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt
    branches/cmake-bringup/dll/directx/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt
    branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt

Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010
@@ -37,6 +37,9 @@
 target_link_libraries(libxslt libxml2)
 
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
+if(MSVC)
+add_importlibs(libxslt ntdll)
+endif()
 
 add_dependencies(libxslt psdk buildno_header)
 

Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMakeLists.txt?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010
@@ -1,8 +1,10 @@
 
+if (NOT MSVC)
 add_subdirectory(amstream)
+add_subdirectory(d3d8thk)
+endif()
 #add_subdirectory(bdaplgin) #disabled in trunk
 #add_subdirectory(d3d8) #disabled in trunk
-add_subdirectory(d3d8thk)
 #add_subdirectory(d3d9) #disabled in trunk
 #add_subdirectory(ddraw) #disabled in trunk
 add_subdirectory(devenum)

Modified: branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010
@@ -38,3 +38,4 @@
 
 
 add_cab_target(dinput 1)
+add_importlib_target(dinput.spec)

Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010
@@ -46,7 +46,6 @@
 set_module_type(quartz win32dll)
 
 target_link_libraries(quartz
-    ${CMAKE_CURRENT_BINARY_DIR}/quartz.def
     quartz_proxy
     strmiids
     uuid

Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010
@@ -38,7 +38,7 @@
     volumetexture.c
     wined3d_main.c
     version.rc
-    wined3d.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
 
 if(ARCH MATCHES amd64)
 list(APPEND SOURCE
@@ -55,10 +55,7 @@
 add_library(wined3d SHARED ${SOURCE})
 set_module_type(wined3d win32dll)
 
-target_link_libraries(wined3d
-    ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def
-    wine
-    uuid)
+target_link_libraries(wined3d wine uuid)
 
 add_importlibs(wined3d
     user32
@@ -68,7 +65,7 @@
     msvcrt
     kernel32
     ntdll)
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
 
 add_dependencies(wined3d wineheaders)
-add_cab_target(wined3d 1)
+add_cab_target(wined3d 1)
+add_importlib_target(wined3d.spec)




More information about the Ros-diffs mailing list