[ros-diffs] [spetreolle] 49611: [CMAKE] Add dplayx and ksproxy.ax to bootcd.

Author: spetreolle
Date: Thu Nov 18 15:41:39 2010
New Revision: 49611

URL: http://svn.reactos.org/svn/reactos?rev=49611&view=rev
Log:
[CMAKE]
Add dplayx and ksproxy.ax to bootcd.

Modified:
    branches/cmake-bringup/dll/directx/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
    branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake…
==============================================================================
--- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Thu Nov 18 15:41:39
2010
@@ -14,7 +14,7 @@
 add_subdirectory(dsound)
 #add_subdirectory(dsound_new) #disabled in trunk
 add_subdirectory(dxdiagn)
-#add_subdirectory(ksproxy)# undefined reference to `operator new(unsigned int)'
+add_subdirectory(ksproxy)
 add_subdirectory(ksuser)
 add_subdirectory(msdmo)
 #add_subdirectory(msdvbnp) #disabled in trunk

Modified: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay…
==============================================================================
--- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Thu Nov 18
15:41:39 2010
@@ -35,4 +35,5 @@
     msvcrt
     kernel32
     ntdll)
-    
+
+add_cab_target(dplayx 1)

Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Thu Nov 18
15:41:39 2010
@@ -1,6 +1,10 @@
-set_cpp()
+spec2def(ksproxy.ax ksproxy.spec)
 
-spec2def(ksproxy.ax ksproxy.spec)
+add_definitions(-D_DLL -D__USE_CRTIMP)
+  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
+  add_definitions(
+    -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
+    -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
 
 add_library(ksproxy SHARED
     allocator.cpp
@@ -28,13 +32,18 @@
 if(MSVC)
     set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-")
 else()
-    set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+    #FIXME : can't build if this is enabled, check if this is needed
+    #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
 endif(MSVC)
 
 
-target_link_libraries(ksproxy strmiids)
-
+target_link_libraries(ksproxy 
+    stlport -lsupc++ -lgcc
+    strmiids)
+    
 add_importlibs(ksproxy
+    mingw32
+    coldname
     advapi32
     ole32
     setupapi
@@ -44,3 +53,5 @@
     ntdll)
 
 add_dependencies(ksproxy psdk buildno_header)
+
+add_cab_target(ksproxy 1)