[CMAKE]

Add dplayx and ksproxy.ax to bootcd.

svn path=/branches/cmake-bringup/; revision=49611

diff --git a/dll/directx/CMakeLists.txt b/dll/directx/CMakeLists.txt
index 410b6be..0f677fa 100644 (file)
--- a/dll/directx/CMakeLists.txt
+++ b/dll/directx/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory(dplayx)
 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

diff --git a/dll/directx/dplayx/CMakeLists.txt b/dll/directx/dplayx/CMakeLists.txt
index 6460c03..b551fcd 100644 (file)
--- a/dll/directx/dplayx/CMakeLists.txt
+++ b/dll/directx/dplayx/CMakeLists.txt
@@ -35,4 +35,5 @@ add_importlibs(dplayx
     msvcrt
     kernel32
     ntdll)
-    
\ No newline at end of file
+
+add_cab_target(dplayx 1)
\ No newline at end of file

diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt
index d188bff..b30bcf0 100644 (file)
--- a/dll/directx/ksproxy/CMakeLists.txt
+++ b/dll/directx/ksproxy/CMakeLists.txt
@@ -1,7 +1,11 @@
-set_cpp()
-
 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
     basicaudio.cpp
@@ -28,13 +32,18 @@ set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
 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 @@ add_importlibs(ksproxy
     ntdll)
 
 add_dependencies(ksproxy psdk buildno_header)
+
+add_cab_target(ksproxy 1)
\ No newline at end of file