[ros-diffs] [akhaldi] 52213: [CMAKE] * Automatically add _DLL and __USE_CRTIMP definitions when linking to msvcrt. * Separate some flags from definitions (using add_compiler_flags).
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Mon Jun 13 15:31:12 UTC 2011
Author: akhaldi
Date: Mon Jun 13 15:31:11 2011
New Revision: 52213
URL: http://svn.reactos.org/svn/reactos?rev=52213&view=rev
Log:
[CMAKE]
* Automatically add _DLL and __USE_CRTIMP definitions when linking to msvcrt.
* Separate some flags from definitions (using add_compiler_flags).
Modified:
trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt
trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt
trunk/reactos/base/applications/findstr/CMakeLists.txt
trunk/reactos/base/applications/logoff/CMakeLists.txt
trunk/reactos/base/applications/network/dwnl/CMakeLists.txt
trunk/reactos/base/applications/network/finger/CMakeLists.txt
trunk/reactos/base/applications/network/ftp/CMakeLists.txt
trunk/reactos/base/applications/network/route/CMakeLists.txt
trunk/reactos/base/applications/network/telnet/CMakeLists.txt
trunk/reactos/base/applications/network/whois/CMakeLists.txt
trunk/reactos/base/applications/regedit/CMakeLists.txt
trunk/reactos/base/applications/shutdown/CMakeLists.txt
trunk/reactos/base/applications/sndvol32/CMakeLists.txt
trunk/reactos/base/applications/winhlp32/CMakeLists.txt
trunk/reactos/base/applications/wordpad/CMakeLists.txt
trunk/reactos/base/services/telnetd/CMakeLists.txt
trunk/reactos/base/shell/explorer/CMakeLists.txt
trunk/reactos/base/system/bootok/CMakeLists.txt
trunk/reactos/base/system/expand/CMakeLists.txt
trunk/reactos/base/system/format/CMakeLists.txt
trunk/reactos/base/system/msiexec/CMakeLists.txt
trunk/reactos/base/system/regsvr32/CMakeLists.txt
trunk/reactos/base/system/subst/CMakeLists.txt
trunk/reactos/cmake/CMakeMacros.cmake
trunk/reactos/dll/3rdparty/dxtn/CMakeLists.txt
trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt
trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt
trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt
trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt
trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt
trunk/reactos/dll/cpl/desk/CMakeLists.txt
trunk/reactos/dll/cpl/intl/CMakeLists.txt
trunk/reactos/dll/cpl/main/CMakeLists.txt
trunk/reactos/dll/cpl/mmsys/CMakeLists.txt
trunk/reactos/dll/directx/dsound/CMakeLists.txt
trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
trunk/reactos/dll/directx/qedit/CMakeLists.txt
trunk/reactos/dll/directx/quartz/CMakeLists.txt
trunk/reactos/dll/win32/avifil32/CMakeLists.txt
trunk/reactos/dll/win32/comdlg32/CMakeLists.txt
trunk/reactos/dll/win32/crypt32/CMakeLists.txt
trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
trunk/reactos/dll/win32/dnsapi/CMakeLists.txt
trunk/reactos/dll/win32/gdi32/CMakeLists.txt
trunk/reactos/dll/win32/gdiplus/CMakeLists.txt
trunk/reactos/dll/win32/glu32/CMakeLists.txt
trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
trunk/reactos/dll/win32/inetmib1/CMakeLists.txt
trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt
trunk/reactos/dll/win32/itss/CMakeLists.txt
trunk/reactos/dll/win32/jscript/CMakeLists.txt
trunk/reactos/dll/win32/mciwave/CMakeLists.txt
trunk/reactos/dll/win32/mlang/CMakeLists.txt
trunk/reactos/dll/win32/msacm32/CMakeLists.txt
trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt
trunk/reactos/dll/win32/msctf/CMakeLists.txt
trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt
trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
trunk/reactos/dll/win32/mshtml/CMakeLists.txt
trunk/reactos/dll/win32/msi/CMakeLists.txt
trunk/reactos/dll/win32/msrle32/CMakeLists.txt
trunk/reactos/dll/win32/msxml3/CMakeLists.txt
trunk/reactos/dll/win32/odbc32/CMakeLists.txt
trunk/reactos/dll/win32/odbccp32/CMakeLists.txt
trunk/reactos/dll/win32/opengl32/CMakeLists.txt
trunk/reactos/dll/win32/riched20/CMakeLists.txt
trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
trunk/reactos/dll/win32/setupapi/CMakeLists.txt
trunk/reactos/dll/win32/syssetup/CMakeLists.txt
trunk/reactos/dll/win32/twain_32/CMakeLists.txt
trunk/reactos/dll/win32/user32/CMakeLists.txt
trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt
trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt
trunk/reactos/lib/newinflib/CMakeLists.txt
trunk/reactos/lib/smlib/CMakeLists.txt
trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt
Modified: trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,4 +1,3 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(find find.c find.rc)
Modified: trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,4 +1,3 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(hostname hostname.c hostname.rc)
Modified: trunk/reactos/base/applications/findstr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/findstr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/findstr/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,9 +1,5 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
-
-add_executable(findstr
- findstr.c
- findstr.rc)
+add_executable(findstr findstr.c findstr.rc)
set_module_type(findstr win32cui)
add_importlibs(findstr user32 msvcrt kernel32)
Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
misc.c
Modified: trunk/reactos/base/applications/network/dwnl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/dwnl/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,4 +1,3 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
@@ -10,7 +9,7 @@
add_importlibs(dwnl urlmon wininet msvcrt kernel32)
if(MSVC)
-add_importlibs(dwnl ntdll)
+ add_importlibs(dwnl ntdll)
endif()
add_cd_file(TARGET dwnl DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/network/finger/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/finger/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D__USE_W32_SOCKETS
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__USE_W32_SOCKETS)
add_executable(finger
finger.c
Modified: trunk/reactos/base/applications/network/ftp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/ftp/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -Dlint)
+add_definitions(-Dlint)
add_executable(ftp
cmds.c
Modified: trunk/reactos/base/applications/network/route/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/route/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/route/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/route/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/telnet/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D_CRT_NONSTDC_NO_DEPRECATE
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
set_cpp()
Modified: trunk/reactos/base/applications/network/whois/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/whois/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/whois/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(whois whois.c whois.rc)
Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
set_rc_compiler()
Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
misc.c
Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,11 +1,9 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
list(APPEND SOURCE
dialog.c
- misc.c
+ misc.c
mixer.c
sndvol32.c
sndvol32.rc)
Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -7,8 +7,7 @@
-D__ROS_LONG64__
-D_CRT_NONSTDC_NO_DEPRECATE
-Dfileno=_fileno
- -Disatty=_isatty
- -D_DLL -D__USE_CRTIMP)
+ -Disatty=_isatty)
add_executable(winhlp32
callback.c
@@ -20,7 +19,6 @@
rsrc.rc)
set_module_type(winhlp32 win32gui)
-
target_link_libraries(winhlp32 wine)
add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)
Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,9 +1,7 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_definitions(
- -D__ROS_LONG64__
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__ROS_LONG64__)
set_rc_compiler()
@@ -17,7 +15,6 @@
add_executable(wordpad ${SOURCE})
set_module_type(wordpad win32gui)
-
target_link_libraries(wordpad wine uuid)
add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/services/telnetd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/services/telnetd/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(telnetd
telnetd.c
Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -10,8 +10,7 @@
add_definitions(
-DWIN32
- -D__WINDRES__
- -D_DLL -D__USE_CRTIMP)
+ -D__WINDRES__)
#add_pch(explorer precomp.h)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -67,9 +66,7 @@
uuid)
add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll)
-
set_image_base(explorer 0x00400000)
-
add_dependencies(explorer psdk)
add_cd_file(TARGET explorer DESTINATION reactos FOR all)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all)
Modified: trunk/reactos/base/system/bootok/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/bootok/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/bootok/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/bootok/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
Modified: trunk/reactos/base/system/expand/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/expand/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/expand/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: trunk/reactos/base/system/format/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,4 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
-
-include_directories(.)
set_rc_compiler()
add_executable(format format.c format.rc)
Modified: trunk/reactos/base/system/msiexec/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D__WINESRC__)
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
@@ -13,7 +11,6 @@
rsrc.rc)
set_module_type(msiexec win32gui)
-
target_link_libraries(msiexec uuid wine)
add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)
add_cd_file(TARGET msiexec DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/system/regsvr32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
-include_directories(.)
set_rc_compiler()
add_executable(regsvr32 regsvr32.c regsvr32.rc)
Modified: trunk/reactos/base/system/subst/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/base/system/subst/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/subst/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-include_directories(.)
set_rc_compiler()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(subst subst.c subst.rc)
Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -231,6 +231,7 @@
add_dependency_node(${MODULE})
foreach(LIB ${ARGN})
if ("${LIB}" MATCHES "msvcrt")
+ add_definitions(-D_DLL -D__USE_CRTIMP)
target_link_libraries(${MODULE} msvcrtex)
endif()
target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}${CMAKE_STATIC_LIBRARY_SUFFIX})
Modified: trunk/reactos/dll/3rdparty/dxtn/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/dxtn/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/dxtn/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(dxtn.dll dxtn.spec)
Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -4,8 +4,7 @@
-D_WINDOWS
-D_MBCS
-DJPEG_DLL
- -Dmain=mainptr
- -D_DLL -D__USE_CRTIMP)
+ -Dmain=mainptr)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
@@ -60,9 +59,6 @@
jmemnobs.c)
set_entrypoint(libjpeg 0)
-
add_importlibs(libjpeg msvcrt kernel32)
-
add_dependencies(libjpeg psdk)
-
add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -3,8 +3,7 @@
-DWIN32
-DNDEBUG
-D_WINDOWS
- -DPNG_BUILD_DLL
- -D_DLL -D__USE_CRTIMP)
+ -DPNG_BUILD_DLL)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng
@@ -29,11 +28,7 @@
pngwutil.c)
set_entrypoint(libpng 0)
-
target_link_libraries(libpng zlib)
-
add_importlibs(libpng msvcrt kernel32)
-
add_dependencies(libpng psdk)
-
add_cd_file(TARGET libpng DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -4,8 +4,7 @@
-DNDEBUG
-DBUILD_LIBTIFF_DLL
-DDLL_EXPORT
- -DUSE_WIN32_FILEIO
- -D_DLL -D__USE_CRTIMP)
+ -DUSE_WIN32_FILEIO)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff
@@ -52,11 +51,7 @@
tif_zip.c)
set_entrypoint(libtiff 0)
-
target_link_libraries(libtiff zlib getopt)
-
add_importlibs(libtiff user32 msvcrt kernel32)
-
add_dependencies(libtiff psdk)
-
add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -8,8 +8,7 @@
-DHAVE_WIN32_THREADS
-D_REENTRANT
-D_WINSOCKAPI_
- -DLIBXML_STATIC
- -D_DLL -D__USE_CRTIMP)
+ -DLIBXML_STATIC)
add_library(libxslt SHARED
attributes.c
@@ -33,14 +32,12 @@
xsltutils.c)
set_entrypoint(libxslt 0)
+target_link_libraries(libxslt libxml2)
+add_importlibs(libxslt msvcrt ws2_32 kernel32)
-target_link_libraries(libxslt libxml2)
-
-add_importlibs(libxslt msvcrt ws2_32 kernel32)
if(MSVC)
-add_importlibs(libxslt ntdll)
+ add_importlibs(libxslt ntdll)
endif()
add_dependencies(libxslt psdk)
-
add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,22 +1,21 @@
if(NOT MSVC)
-add_definitions(-w)
+ add_compiler_flags(-w)
endif()
add_definitions(
-DUSE_EXTERNAL_DXTN_LIB=1
-DBUILD_GL32
-DWIN32
- -DUSE_3DNOW_ASM
- -D_DLL -D__USE_CRTIMP)
+ -DUSE_3DNOW_ASM)
if(ARCH MATCHES i386)
-add_definitions(
- -DUSE_X86_ASM
- -DUSE_MMX_ASM
- -DUSE_SSE_ASM)
+ add_definitions(
+ -DUSE_X86_ASM
+ -DUSE_MMX_ASM
+ -DUSE_SSE_ASM)
else()
-add_definitions(-DGL_NO_STDCALL)
+ add_definitions(-DGL_NO_STDCALL)
endif(ARCH MATCHES i386)
if(NOT MSVC)
@@ -229,44 +228,39 @@
src/vbo/vbo_split_inplace.c
src/drivers/windows/icd/mesa.def)
-set_source_files_properties(src/drivers/windows/icd/mesa.def PROPERTIES EXTERNAL_OBJECT TRUE)
-
if(ARCH MATCHES i386)
-list(APPEND SOURCE
- src/tnl/t_vertex_sse.c
- src/x86/3dnow.c
- src/x86/3dnow_normal.S
- src/x86/3dnow_xform1.S
- src/x86/3dnow_xform2.S
- src/x86/3dnow_xform3.S
- src/x86/3dnow_xform4.S
- src/x86/common_x86.c
- src/x86/common_x86_asm.S
- src/x86/glapi_x86.S
- src/x86/mmx_blend.S
- src/x86/read_rgba_span_x86.S
- src/x86/sse_normal.S
- src/x86/sse_xform1.S
- src/x86/sse_xform2.S
- src/x86/sse_xform3.S
- src/x86/sse_xform4.S
- src/x86/sse.c
- src/x86/x86.c
- src/x86/x86_cliptest.S
- src/x86/x86_xform2.S
- src/x86/x86_xform3.S
- src/x86/x86_xform4.S
- src/x86/rtasm/x86sse.c)
+ list(APPEND SOURCE
+ src/tnl/t_vertex_sse.c
+ src/x86/3dnow.c
+ src/x86/3dnow_normal.S
+ src/x86/3dnow_xform1.S
+ src/x86/3dnow_xform2.S
+ src/x86/3dnow_xform3.S
+ src/x86/3dnow_xform4.S
+ src/x86/common_x86.c
+ src/x86/common_x86_asm.S
+ src/x86/glapi_x86.S
+ src/x86/mmx_blend.S
+ src/x86/read_rgba_span_x86.S
+ src/x86/sse_normal.S
+ src/x86/sse_xform1.S
+ src/x86/sse_xform2.S
+ src/x86/sse_xform3.S
+ src/x86/sse_xform4.S
+ src/x86/sse.c
+ src/x86/x86.c
+ src/x86/x86_cliptest.S
+ src/x86/x86_xform2.S
+ src/x86/x86_xform3.S
+ src/x86/x86_xform4.S
+ src/x86/rtasm/x86sse.c)
else()
-list(APPEND SOURCE src/x86-64/x86-64.c src/x86-64/xform4.S)
-endif(ARCH MATCHES i386)
+ list(APPEND SOURCE src/x86-64/x86-64.c src/x86-64/xform4.S)
+endif()
add_library(mesa32 SHARED ${SOURCE})
set_entrypoint(mesa32 0)
-
add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll)
-
add_dependencies(mesa32 psdk)
-
add_cd_file(TARGET mesa32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,11 +1,9 @@
+
+add_definitions(-D_WIN32)
set_unicode()
+set_rc_compiler()
-add_definitions(
- -D_WIN32
- -D_DLL -D__USE_CRTIMP)
-
-set_rc_compiler()
spec2def(desk.cpl desk.spec)
add_library(desk SHARED
Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,6 @@
set_unicode()
set_rc_compiler()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(intl.cpl intl.spec)
Modified: trunk/reactos/dll/cpl/main/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,6 @@
set_unicode()
set_rc_compiler()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(main.cpl main.spec)
Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,6 @@
set_unicode()
set_rc_compiler()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(mmsys.cpl mmsys.spec)
Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,7 @@
add_definitions(
-D_WINE
- -D_USE_MATH_DEFINES
- -D_DLL -D__USE_CRTIMP)
+ -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -2,7 +2,6 @@
spec2def(ksproxy.ax ksproxy.spec)
add_definitions(
- -D_DLL -D__USE_CRTIMP
-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
-DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
@@ -37,10 +36,10 @@
#FIXME : can't build if this is enabled, check if this is needed
#set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames)
-endif(MSVC)
+endif()
-target_link_libraries(ksproxy stlport strmiids)
-
+target_link_libraries(ksproxy stlport strmiids)
+
add_importlibs(ksproxy
advapi32
ole32
Modified: trunk/reactos/dll/directx/qedit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/directx/qedit/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,9 +1,7 @@
set_unicode()
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
Modified: trunk/reactos/dll/directx/quartz/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -6,9 +6,7 @@
-D__WINESRC__
-DENTRY_PREFIX=QUARTZ_
-DREGISTER_PROXY_DLL
- -DPROXY_DELEGATION
- -D_DLL
- -D__USE_CRTIMP)
+ -DPROXY_DELEGATION)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,7 @@
add_definitions(
-D__WINESRC__
- -D_WINE
- -D_DLL -D__USE_CRTIMP)
+ -D_WINE)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,6 @@
add_definitions(
-D__WINESRC__
- -D_DLL
- -D__USE_CRTIMP
-D_WINE)
remove_definitions(-D_WIN32_WINNT=0x502)
@@ -54,6 +52,5 @@
oldnames)
add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
-
add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
add_importlib_target(crypt32.spec)
Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,16 +1,14 @@
add_definitions(
-D__WINESRC__
- -D_DLL
- -D__USE_CRTIMP
-D_WINE
-DHAVE_REGEX_H
-DHAVE_ALLOCA_H
-D_IMAGEHLP_SOURCE_)
if(ARCH MATCHES amd64)
-add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3)
-endif(ARCH MATCHES amd64)
+ add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3)
+endif()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -49,7 +47,6 @@
add_library(dbghelp SHARED ${SOURCE})
set_module_type(dbghelp win32dll)
-
target_link_libraries(dbghelp
wine
${PSEH_LIB}
Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -4,9 +4,7 @@
${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src
${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32)
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -DADNS_JGAA_WIN32)
+add_definitions(-DADNS_JGAA_WIN32)
spec2def(dnsapi.dll dnsapi.spec)
@@ -24,7 +22,6 @@
add_library(dnsapi SHARED ${SOURCE})
set_entrypoint(dnsapi 0)
-
target_link_libraries(dnsapi adns)
add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
add_pch(dnsapi dnsapi/precomp.h)
Modified: trunk/reactos/dll/win32/gdi32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,17 +1,15 @@
set_unicode()
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -DLANGPACK)
+add_definitions(-DLANGPACK)
include_directories(include)
spec2def(gdi32.dll gdi32.spec)
if(ARCH MATCHES i386)
-list(APPEND SOURCE
- objects/efloat.c)
+ list(APPEND SOURCE
+ objects/efloat.c)
endif()
list(APPEND SOURCE
Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,7 @@
add_definitions(
-D__WINESRC__
- -D_USE_MATH_DEFINES
- -D_DLL -D__USE_CRTIMP)
+ -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -31,7 +30,6 @@
add_library(gdiplus SHARED ${SOURCE})
set_module_type(gdiplus win32dll)
-
target_link_libraries(gdiplus uuid wine)
add_importlibs(gdiplus
@@ -46,9 +44,9 @@
ntdll)
add_importlib_target(gdiplus.spec)
-
+
if(ARCH MATCHES amd64)
-target_link_libraries(gdiplus crt)
-endif(ARCH MATCHES amd64)
+ target_link_libraries(gdiplus crt)
+endif()
add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -2,8 +2,7 @@
add_definitions(
-DRESOLVE_3D_TEXTURE_SUPPORT
-DBUILD_GL32
- -DLIBRARYBUILD
- -D_DLL -D__USE_CRTIMP)
+ -DLIBRARYBUILD)
include_directories(
include
@@ -110,7 +109,6 @@
add_library(glu32 SHARED ${SOURCE})
set_entrypoint(glu32 0)
-
target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
add_importlibs(glu32
Modified: trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D__WINESRC__)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(imaadp32.acm imaadp32.acm.spec)
@@ -15,9 +12,7 @@
set_entrypoint(imaadp32.acm 0)
set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")
-
target_link_libraries(imaadp32.acm wine)
-
add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
add_dependencies(imaadp32.acm psdk)
add_cd_file(TARGET imaadp32.acm DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D_IMAGEHLP_SOURCE_)
-
+add_definitions(-D_IMAGEHLP_SOURCE_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(imagehlp.dll imagehlp.spec)
@@ -19,12 +16,8 @@
add_library(imagehlp SHARED ${SOURCE})
set_module_type(imagehlp win32dll)
-
target_link_libraries(imagehlp wine)
-
add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
add_importlib_target(imagehlp.spec)
-
add_pch(imagehlp precomp.h)
-
add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/inetmib1/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(inetmib1.dll inetmib1.spec)
@@ -15,7 +12,6 @@
add_library(inetmib1 SHARED ${SOURCE})
set_module_type(inetmib1 win32dll)
-
target_link_libraries(inetmib1 wine)
add_importlibs(inetmib1
Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
set_unicode()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/wine
Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
@@ -24,7 +21,6 @@
add_library(itss SHARED ${SOURCE})
set_module_type(itss win32dll)
-
target_link_libraries(itss uuid wine)
add_importlibs(itss
Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,6 @@
add_typelib(jsglobal jsglobal.idl)
+
add_dependencies(jsglobal stdole2)
remove_definitions(-D_WIN32_WINNT=0x502)
@@ -8,8 +9,6 @@
add_definitions(
-D__WINESRC__
-D_USE_MATH_DEFINES
- -D_DLL
- -D__USE_CRTIMP
-Disinf=!_finite
-Disnan=_isnan)
Modified: trunk/reactos/dll/win32/mciwave/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,6 @@
add_definitions(
-D__WINESRC__
- -D_DLL -D__USE_CRTIMP
-D_WINE)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -19,7 +17,6 @@
add_library(mlang SHARED ${SOURCE})
set_entrypoint(mlang 0)
-
target_link_libraries(mlang uuid wine)
add_importlibs(mlang
Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,6 @@
set_unicode()
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
Modified: trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D__WINESRC__)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msadp32.acm msadp32.acm.spec)
Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -31,7 +29,6 @@
add_library(msctf SHARED ${SOURCE})
set_module_type(msctf win32dll)
-
target_link_libraries(msctf uuid wine)
add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D__WINESRC__)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msg711.acm msg711.acm.spec)
@@ -15,7 +12,6 @@
set_entrypoint(msg711.acm 0)
set_target_properties(msg711.acm PROPERTIES SUFFIX "")
-
target_link_libraries(msg711.acm wine)
add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll)
add_dependencies(msg711.acm psdk)
Modified: trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D_DLL -D__USE_CRTIMP
- -D__WINESRC__)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msgsm32.acm msgsm32.acm.spec)
@@ -15,9 +12,7 @@
set_entrypoint(msgsm32.acm 0)
set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")
-
target_link_libraries(msgsm32.acm wine)
-
add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll)
add_dependencies(msgsm32.acm psdk)
add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -2,11 +2,7 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(
- -D__WINESRC__
- -D_DLL
- -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_idl_Headers(mshtml_nsiface_header nsiface.idl)
Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -14,7 +14,7 @@
action.c
alter.c
appsearch.c
- assembly.c
+ assembly.c
automation.c
classes.c
cond.tab.c
@@ -68,13 +68,9 @@
add_library(msi SHARED ${SOURCE})
add_idl_Headers(msi_idlheader msiserver.idl)
-
add_typelib(msi_tlb msiserver.idl)
-
set_module_type(msi win32dll)
-
target_link_libraries(msi uuid ${PSEH_LIB} wine)
-
add_dependencies(msi msi_idlheader msi_tlb)
add_importlibs(msi
Modified: trunk/reactos/dll/win32/msrle32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -8,17 +8,16 @@
add_definitions(
-D__WINESRC__
-D_WINE
- -DLIBXML_STATIC
- -D_DLL
- -D__USE_CRTIMP)
+ -DLIBXML_STATIC)
if(MSVC)
-add_definitions(/FIwine/typeof.h)
+ add_compiler_flags(/FIwine/typeof.h)
endif(MSVC)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
+
spec2def(msxml3.dll msxml3.spec)
list(APPEND SOURCE
Modified: trunk/reactos/dll/win32/odbc32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/odbc32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbc32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -23,5 +22,4 @@
kernel32
ntdll)
-
add_cd_file(TARGET odbc32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(odbccp32.dll odbccp32.spec)
@@ -13,8 +10,8 @@
${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
add_library(odbccp32 SHARED ${SOURCE})
+
set_entrypoint(odbccp32 0)
-
target_link_libraries(odbccp32 uuid wine)
add_importlibs(odbccp32
Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
set_unicode()
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(opengl32.dll opengl32.spec)
Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,11 +1,9 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(riched20.dll riched20.spec)
+
set_rc_compiler()
list(APPEND SOURCE
@@ -51,5 +49,4 @@
ntdll)
add_importlib_target(riched20.spec)
-
add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,5 @@
-add_definitions(
- -D__WINESRC__
- -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(rsaenh.dll rsaenh.spec)
Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -2,8 +2,6 @@
set_unicode()
add_definitions(
- -D_DLL
- -D__USE_CRTIMP
-D_SETUPAPI_
-D_CFGMGR32_
-Dwcsnicmp=_wcsnicmp)
@@ -13,6 +11,7 @@
${REACTOS_BINARY_DIR}/include/reactos/idl)
set_rc_compiler()
+
spec2def(setupapi.dll setupapi.spec)
list(APPEND SOURCE
@@ -58,6 +57,5 @@
kernel32
ntdll)
-
add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all)
add_importlib_target(setupapi.spec)
Modified: trunk/reactos/dll/win32/syssetup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,8 +1,7 @@
+
set_unicode()
+set_rc_compiler()
-add_definitions(-D_DLL -D__USE_CRTIMP)
-
-set_rc_compiler()
spec2def(syssetup.dll syssetup.spec)
list(APPEND SOURCE
@@ -19,9 +18,7 @@
set_module_type(syssetup win32dll)
-target_link_libraries(syssetup
- uuid
- ${PSEH_LIB})
+target_link_libraries(syssetup uuid ${PSEH_LIB})
add_importlibs(syssetup
msvcrt
@@ -38,5 +35,4 @@
kernel32
ntdll)
-
add_cd_file(TARGET syssetup DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/twain_32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
spec2def(twain_32.dll twain_32.spec)
Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -2,8 +2,6 @@
set_unicode()
spec2def(user32.dll user32.spec)
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(
BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine
Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,6 +1,5 @@
add_definitions(
- -D_DLL -D__USE_CRTIMP
-D__WINESRC__
-DWIN32)
@@ -16,18 +15,14 @@
set_entrypoint(winemp3.acm 0)
set_target_properties(winemp3.acm PROPERTIES SUFFIX "")
-
-target_link_libraries(winemp3.acm
- wine
- libmpg123)
+target_link_libraries(winemp3.acm wine libmpg123)
add_importlibs(winemp3.acm
- msvcrt
winmm
user32
+ msvcrt
kernel32
ntdll)
add_dependencies(winemp3.acm psdk)
-
-add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)
+add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,7 +1,5 @@
-include_directories(
- .
- include)
+include_directories(include)
add_definitions(
-D__MINGW32__
Modified: trunk/reactos/lib/newinflib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -21,7 +21,7 @@
add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS)
if(NOT MSVC)
- add_definitions(-Wpointer-arith -Wwrite-strings)
+ add_compiler_flags(-Wpointer-arith -Wwrite-strings)
endif()
add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
target_link_libraries(inflibhost unicode)
Modified: trunk/reactos/lib/smlib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/lib/smlib/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/smlib/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,5 +1,3 @@
-
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt?rev=52213&r1=52212&r2=52213&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Mon Jun 13 15:31:11 2011
@@ -1,4 +1,3 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(
BEFORE .
@@ -19,7 +18,7 @@
desktopbg.c
dllmain.c
exitros.c
- file.c
+ file.c
guiconsole.c
handle.c
harderror.c
More information about the Ros-diffs
mailing list