[ros-diffs] [spetreolle] 49895: [CMAKE] Fix build for winmm and syssetup.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Thu Dec 2 12:58:59 UTC 2010


Author: spetreolle
Date: Thu Dec  2 12:58:59 2010
New Revision: 49895

URL: http://svn.reactos.org/svn/reactos?rev=49895&view=rev
Log:
[CMAKE]
Fix build for winmm and syssetup.

Modified:
    branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winmm/winmm.spec

Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt?rev=49895&r1=49894&r2=49895&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Thu Dec  2 12:58:59 2010
@@ -1,11 +1,11 @@
-
 set_unicode()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
+set_rc_compiler()
 spec2def(syssetup.dll syssetup.spec)
 
-add_library(syssetup SHARED
+list(APPEND SOURCE
     classinst.c
     dllmain.c
     install.c
@@ -13,6 +13,8 @@
     wizard.c
     syssetup.rc
     ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def)
+
+add_library(syssetup SHARED ${SOURCE})
 
 set_module_type(syssetup win32dll)
 

Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt?rev=49895&r1=49894&r2=49895&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Thu Dec  2 12:58:59 2010
@@ -6,7 +6,7 @@
 
 set_rc_compiler()
 
-add_library(winmm SHARED
+list(APPEND SOURCE
     driver.c
     joystick.c
     lolvldrv.c
@@ -18,6 +18,8 @@
     winmm.c
     winmm_res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
+
+add_library(winmm SHARED ${SOURCE})
 
 set_module_type(winmm win32dll)
 

Modified: branches/cmake-bringup/dll/win32/winmm/winmm.spec
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/winmm.spec?rev=49895&r1=49894&r2=49895&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] Thu Dec  2 12:58:59 2010
@@ -1,7 +1,7 @@
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA
-3 stub @
-4 stub @
+3 stub WINMM_3
+4 stub WINMM_4
 
 @ stdcall CloseDriver(long long long)
 @ stdcall DefDriverProc(long long long long long)




More information about the Ros-diffs mailing list