[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 17 Oct 2014 23:29:24 +0000 (23:29 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 17 Oct 2014 23:29:24 +0000 (23:29 +0000)
* Addendum to r64795.
* Also remove unneeded wine linking and ntdll importing.
* Remove redundant defines.

svn path=/trunk/; revision=64796

54 files changed:
rostests/apitests/CMakeLists.txt
rostests/apitests/com/CMakeLists.txt
rostests/apitests/crt/CMakeLists.txt
rostests/apitests/crt/ntdll_crt_apitest.cmake
rostests/apitests/dciman32/CMakeLists.txt
rostests/apitests/msvcrt/CmdLineUtil/CMakeLists.txt
rostests/apitests/psapi/CMakeLists.txt
rostests/apitests/shell32/CMakeLists.txt
rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt
rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt
rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt
rostests/apitests/winhttp/CMakeLists.txt
rostests/apitests/wininet/CMakeLists.txt
rostests/kmtests/CMakeLists.txt
rostests/kmtests/example/CMakeLists.txt
rostests/kmtests/kernel32/CMakeLists.txt
rostests/kmtests/ntos_io/CMakeLists.txt
rostests/rosautotest/CMakeLists.txt
rostests/tests/CMakeLists.txt
rostests/tests/dllexport/CMakeLists.txt
rostests/tests/mmixer_test/CMakeLists.txt
rostests/winetests/CMakeLists.txt
rostests/winetests/atl/CMakeLists.txt
rostests/winetests/cmd/CMakeLists.txt
rostests/winetests/dnsapi/CMakeLists.txt
rostests/winetests/gdi32/CMakeLists.txt
rostests/winetests/icmp/CMakeLists.txt
rostests/winetests/iphlpapi/CMakeLists.txt
rostests/winetests/mshtml/CMakeLists.txt
rostests/winetests/msvcrt/CMakeLists.txt
rostests/winetests/msxml3/CMakeLists.txt
rostests/winetests/netapi32/CMakeLists.txt
rostests/winetests/ntdll/CMakeLists.txt
rostests/winetests/oleaut32/CMakeLists.txt
rostests/winetests/pdh/CMakeLists.txt
rostests/winetests/propsys/CMakeLists.txt
rostests/winetests/qmgr/CMakeLists.txt
rostests/winetests/quartz/CMakeLists.txt
rostests/winetests/regedit/CMakeLists.txt
rostests/winetests/rpcrt4/CMakeLists.txt
rostests/winetests/serialui/CMakeLists.txt
rostests/winetests/services/CMakeLists.txt
rostests/winetests/shell32/CMakeLists.txt
rostests/winetests/shlwapi/CMakeLists.txt
rostests/winetests/sxs/CMakeLists.txt
rostests/winetests/userenv/CMakeLists.txt
rostests/winetests/uxtheme/CMakeLists.txt
rostests/winetests/version/CMakeLists.txt
rostests/winetests/windowscodecs/CMakeLists.txt
rostests/winetests/windowscodecsext/CMakeLists.txt
rostests/winetests/winmm/CMakeLists.txt
rostests/winetests/wlanapi/CMakeLists.txt

index 99a8bf9..5bd8117 100644 (file)
@@ -1,5 +1,4 @@
-include_directories(
-    include)
+include_directories(include)
 
 add_library(apitest apitest.c)
 
@@ -10,7 +9,7 @@ add_subdirectory(crt)
 add_subdirectory(dciman32)
 add_subdirectory(gdi32)
 if(NOT ARCH STREQUAL "amd64")
-add_subdirectory(kernel32)
+    add_subdirectory(kernel32)
 endif()
 add_subdirectory(msvcrt)
 add_subdirectory(ntdll)
index 1c9c212..0e6cfcd 100644 (file)
@@ -13,5 +13,4 @@ add_executable(com_apitest ${SOURCE})
 target_link_libraries(com_apitest wine uuid)
 set_module_type(com_apitest win32cui)
 add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET com_apitest DESTINATION reactos/bin FOR all)
index 1e77201..b6d98b0 100644 (file)
@@ -1,6 +1,7 @@
 
 include(ntdll_crt_apitest.cmake)
 include(msvcrt_crt_apitest.cmake)
+
 if(NOT ARCH STREQUAL "amd64")
   include(crtdll_crt_apitest.cmake)
 endif()
index 63a51d1..a6432a3 100644 (file)
@@ -151,11 +151,9 @@ elseif(ARCH STREQUAL "amd64")
     )
 endif()
 
-
 add_executable(ntdll_crt_apitest testlist.c ${SOURCE_NTDLL})
 add_target_compile_definitions(ntdll_crt_apitest TEST_NTDLL)
 target_link_libraries(ntdll_crt_apitest wine ${PSEH_LIB})
 set_module_type(ntdll_crt_apitest win32cui)
 add_importlibs(ntdll_crt_apitest ntdll msvcrt kernel32)
 add_cd_file(TARGET ntdll_crt_apitest DESTINATION reactos/bin FOR all)
-
index ad06347..4ae2d5b 100644 (file)
@@ -1,6 +1,5 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
-
 add_executable(dciman32_apitest DCICreatePrimary.c testlist.c)
 target_link_libraries(dciman32_apitest wine)
 set_module_type(dciman32_apitest win32cui)
index 6a07063..ebe8f30 100644 (file)
@@ -1,8 +1,5 @@
 
-list(APPEND SOURCE
-     CmdLineUtil.c)
-
-add_executable(CmdLineUtil ${SOURCE})
+add_executable(CmdLineUtil CmdLineUtil.c)
 set_module_type(CmdLineUtil win32gui UNICODE)
 add_importlibs(CmdLineUtil msvcrt kernel32 ntdll)
 add_cd_file(TARGET CmdLineUtil DESTINATION reactos/bin/data FOR all)
index 76435b1..b043d99 100644 (file)
@@ -1,9 +1,5 @@
 
-list(APPEND SOURCE
-    psapi.c
-    testlist.c)
-
-add_executable(psapi_apitest ${SOURCE})
+add_executable(psapi_apitest psapi.c testlist.c)
 set_module_type(psapi_apitest win32cui)
 add_importlibs(psapi_apitest psapi msvcrt kernel32)
 add_cd_file(TARGET psapi_apitest DESTINATION reactos/bin FOR all)
index 81e334c..514c21b 100644 (file)
@@ -1,11 +1,6 @@
 
 set_cpp(WITH_RUNTIME)
-
-list(APPEND SOURCE
-   menu.cpp
-   testlist.c)
-
-add_executable(shell32_apitest ${SOURCE})
+add_executable(shell32_apitest menu.cpp testlist.c)
 target_link_libraries(shell32_apitest wine uuid)
 set_module_type(shell32_apitest win32cui)
 add_importlibs(shell32_apitest msvcrt kernel32 user32 gdi32 shell32 ole32 shlwapi)
index 84cc534..f9ee75c 100644 (file)
@@ -7,5 +7,4 @@ add_library(w32kdll_2k3sp2 SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def)
 
 set_entrypoint(w32kdll_2k3sp2 0)
-
 add_dependencies(w32kdll_2k3sp2 psdk)
index 6ae24d5..e5cd02d 100644 (file)
@@ -1,9 +1,10 @@
+
 spec2def(w32kdll_2ksp4.dll w32kdll_2ksp4.spec)
 
 add_library(w32kdll_2ksp4 SHARED 
     main.c 
     w32kdll_2ksp4.S
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2ksp4.def)
-set_entrypoint(w32kdll_2ksp4 0)
 
+set_entrypoint(w32kdll_2ksp4 0)
 add_dependencies(w32kdll_2ksp4 psdk)
index 67b4902..0eec3d5 100644 (file)
@@ -7,5 +7,4 @@ add_library(w32kdll_ros SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def)
 
 set_entrypoint(w32kdll_ros 0)
-
 add_dependencies(w32kdll_ros psdk)
index 6fe6e1d..c0e5c85 100644 (file)
@@ -5,6 +5,6 @@ add_library(w32kdll_vista SHARED
     main.c
     w32kdll_vista.S
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_vista.def)
-set_entrypoint(w32kdll_vista 0)
 
+set_entrypoint(w32kdll_vista 0)
 add_dependencies(w32kdll_vista psdk )
index 5b3149b..dffc176 100644 (file)
@@ -1,9 +1,10 @@
+
 spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB)
 
 add_library(w32kdll_xpsp2 SHARED 
     main.c
     sys-stubs.S
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def)
-set_entrypoint(w32kdll_xpsp2 0)
 
+set_entrypoint(w32kdll_xpsp2 0)
 add_dependencies(w32kdll_xpsp2 psdk)
index 2b9ba05..89b13d8 100644 (file)
@@ -1,12 +1,7 @@
 
-list(APPEND SOURCE
-    WinHttpOpen.c
-    testlist.c)
-
-add_executable(winhttp_apitest ${SOURCE})
+add_executable(winhttp_apitest WinHttpOpen.c testlist.c)
 target_link_libraries(winhttp_apitest wine)
 set_module_type(winhttp_apitest win32cui)
 add_importlibs(winhttp_apitest msvcrt kernel32 ntdll)
 #add_delay_importlibs(winhttp_apitest winhttp)
-
 add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all)
index 6b91d57..ea82885 100644 (file)
@@ -1,12 +1,7 @@
 
-list(APPEND SOURCE
-    InternetOpen.c
-    testlist.c)
-
-add_executable(wininet_apitest ${SOURCE})
+add_executable(wininet_apitest InternetOpen.c testlist.c)
 target_link_libraries(wininet_apitest wine)
 set_module_type(wininet_apitest win32cui)
 add_importlibs(wininet_apitest msvcrt kernel32 ntdll)
 #add_delay_importlibs(wininet_apitest wininet)
-
 add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all)
index 90987fd..8de380d 100644 (file)
@@ -1,5 +1,5 @@
-include_directories(
-    include)
+
+include_directories(include)
 
 #
 # subdirectories containing special-purpose drivers
@@ -77,14 +77,12 @@ list(APPEND KMTEST_DRV_SOURCE
     kmtest_drv/kmtest_drv.rc)
 
 add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE})
-
 set_module_type(kmtest_drv kernelmodedriver)
 target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB})
 add_importlibs(kmtest_drv ntoskrnl hal)
 add_dependencies(kmtest_drv bugcodes)
 add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1)
 #add_pch(kmtest_drv include/kmt_test.h)
-
 add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all)
 
 add_library(kmtest_printf
@@ -118,7 +116,6 @@ target_link_libraries(kmtest ${PSEH_LIB})
 add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll)
 add_target_compile_definitions(kmtest KMT_USER_MODE)
 #add_pch(kmtest include/kmt_test.h)
-
 set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_")
 add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all)
 
index 1ea2785..3f280be 100644 (file)
@@ -1,16 +1,14 @@
-include_directories(
-    ../include)
+
+include_directories(../include)
 
 list(APPEND EXAMPLE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     Example_drv.c)
 
 add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE})
-
 set_module_type(example_drv kernelmodedriver)
 target_link_libraries(example_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(example_drv ntoskrnl hal)
 add_target_compile_definitions(example_drv KMT_STANDALONE_DRIVER)
 #add_pch(example_drv ../include/kmt_test.h)
-
 add_cd_file(TARGET example_drv DESTINATION reactos/bin FOR all)
index 852955f..4025156 100644 (file)
@@ -1,16 +1,14 @@
-include_directories(
-    ../include)
+
+include_directories(../include)
 
 list(APPEND FINDFILE_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
     FindFile_drv.c)
 
 add_library(findfile_drv SHARED ${FINDFILE_DRV_SOURCE})
-
 set_module_type(findfile_drv kernelmodedriver)
 target_link_libraries(findfile_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(findfile_drv ntoskrnl hal)
 add_target_compile_definitions(findfile_drv KMT_STANDALONE_DRIVER)
 #add_pch(findfile_drv ../include/kmt_test.h)
-
 add_cd_file(TARGET findfile_drv DESTINATION reactos/bin FOR all)
index af43acf..f05b5dc 100644 (file)
@@ -1,5 +1,5 @@
-include_directories(
-    ../include)
+
+include_directories(../include)
 
 #
 # IoDeviceObject
@@ -9,13 +9,11 @@ list(APPEND IODEVICEOBJECT_DRV_SOURCE
     IoDeviceObject_drv.c)
 
 add_library(iodeviceobject_drv SHARED ${IODEVICEOBJECT_DRV_SOURCE})
-
 set_module_type(iodeviceobject_drv kernelmodedriver)
 target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iodeviceobject_drv ntoskrnl hal)
 add_target_compile_definitions(iodeviceobject_drv KMT_STANDALONE_DRIVER)
 #add_pch(iodeviceobject_drv ../include/kmt_test.h)
-
 add_cd_file(TARGET iodeviceobject_drv DESTINATION reactos/bin FOR all)
 
 #
@@ -26,11 +24,9 @@ list(APPEND IOHELPER_DRV_SOURCE
     IoHelper_drv.c)
 
 add_library(iohelper_drv SHARED ${IOHELPER_DRV_SOURCE})
-
 set_module_type(iohelper_drv kernelmodedriver)
 target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(iohelper_drv ntoskrnl hal)
 add_target_compile_definitions(iohelper_drv KMT_STANDALONE_DRIVER)
 #add_pch(iohelper_drv ../include/kmt_test.h)
-
 add_cd_file(TARGET iohelper_drv DESTINATION reactos/bin FOR all)
index 106d2e7..b48962e 100644 (file)
@@ -21,7 +21,6 @@ list(APPEND SOURCE
     precomp.h)
 
 add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/rosautotestmsg.rc)
-
 set_module_type(rosautotest win32cui UNICODE)
 add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)
 add_pch(rosautotest precomp.h SOURCE)
index a1e44ed..9e2f07c 100644 (file)
@@ -1,5 +1,5 @@
 add_subdirectory(mmixer_test)
-if (NOT MSVC)
+if(NOT MSVC)
     add_subdirectory(pseh2)
 endif()
 add_subdirectory(dllexport)
index 47ca9b0..a204ad3 100644 (file)
@@ -3,21 +3,23 @@ spec2def(dllexport_test_dll1.dll dllexport_test_dll1.spec ADD_IMPORTLIB)
 spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB)
 
 set(baseaddress_dllexport_test_dll1 0x1000000)
+
 add_library(dllexport_test_dll1 SHARED
     dllexport_test_dll1.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def)
+
 set_module_type(dllexport_test_dll1 module)
 add_importlibs(dllexport_test_dll1 dllexport_test_dll2)
 
 set(baseaddress_dllexport_test_dll2 0x2000000)
+
 add_library(dllexport_test_dll2 SHARED
     dllexport_test_dll2.c
     ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def)
-set_module_type(dllexport_test_dll2 module)
 
-add_executable(dllexport_test
-    dllexport_test.c)
+set_module_type(dllexport_test_dll2 module)
 
+add_executable(dllexport_test dllexport_test.c)
 set_module_type(dllexport_test win32cui)
 add_importlibs(dllexport_test dllexport_test_dll1 msvcrt kernel32 ntdll)
 
@@ -25,10 +27,10 @@ if(MSVC)
     add_compile_flags("/Zc:wchar_t-")
 endif()
 
-add_library(dllimport_test SHARED
-    dllimport_framedyn.cpp)
+add_library(dllimport_test SHARED dllimport_framedyn.cpp)
 set_module_type(dllimport_test module)
 add_importlibs(dllimport_test framedyn)
+
 if(NOT MSVC)
     target_link_libraries(dllimport_test framedynex)
 endif()
index 39836e0..a71aaae 100644 (file)
@@ -1,11 +1,8 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer)
-
 add_executable(mmixer_test test.c)
 set_module_type(mmixer_test win32cui)
-
 target_link_libraries(mmixer_test mmixer)
 add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)
index 641ca29..53df93c 100644 (file)
@@ -80,7 +80,7 @@ add_subdirectory(regedit)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
 if(NOT ARCH STREQUAL "amd64")
-add_subdirectory(rpcrt4)
+    add_subdirectory(rpcrt4)
 endif()
 add_subdirectory(rsaenh)
 add_subdirectory(schannel)
index ea5ec09..8c7d151 100644 (file)
@@ -1,3 +1,4 @@
+
 add_definitions(-D_ATL_VER=_ATL_VER_30)
 
 list(APPEND SOURCE
index 440d40f..9a3e90e 100644 (file)
@@ -1,7 +1,5 @@
 
-add_definitions(-D__ROS_LONG64__)
 add_executable(cmd_winetest batch.c testlist.c rsrc.rc)
-target_link_libraries(cmd_winetest wine)
 set_module_type(cmd_winetest win32cui)
-add_importlibs(cmd_winetest msvcrt kernel32 ntdll)
+add_importlibs(cmd_winetest msvcrt kernel32)
 add_cd_file(TARGET cmd_winetest DESTINATION reactos/bin FOR all)
index c0a5da6..cf5176d 100644 (file)
@@ -1,5 +1,4 @@
 
-add_definitions(-D__ROS_LONG64__)
 add_executable(dnsapi_winetest name.c record.c testlist.c)
 set_module_type(dnsapi_winetest win32cui)
 add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32)
index 908ea21..6de9f0a 100644 (file)
@@ -21,7 +21,9 @@ list(APPEND SOURCE
 add_executable(gdi32_winetest ${SOURCE} resource.rc)
 set_module_type(gdi32_winetest win32cui)
 add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(gdi32_winetest ntdll)
 endif()
+
 add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)
index 34d4efb..d0c7b3c 100644 (file)
@@ -1,8 +1,4 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(icmp_winetest icmp.c testlist.c)
 target_link_libraries(icmp_winetest wine uuid)
 set_module_type(icmp_winetest win32cui)
index 0227f73..83bc30a 100644 (file)
@@ -1,8 +1,4 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(iphlpapi_winetest iphlpapi.c testlist.c)
 target_link_libraries(iphlpapi_winetest wine)
 set_module_type(iphlpapi_winetest win32cui)
index ad1e686..6655663 100644 (file)
@@ -1,6 +1,5 @@
 
 add_definitions(-DUSE_WINE_TODOS)
-
 add_idl_Headers(test_tlb_header test_tlb.idl)
 add_typelib(test_tlb.idl)
 
@@ -29,7 +28,6 @@ list(APPEND mshtml_winetest_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/externscr.js)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_winetest_rc_deps}")
-
 target_link_libraries(mshtml_winetest uuid strmiids)
 set_module_type(mshtml_winetest win32cui)
 add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32)
index 1d9d73c..2fae959 100644 (file)
@@ -21,7 +21,6 @@ list(APPEND SOURCE
     time.c)
 
 add_executable(msvcrt_winetest ${SOURCE})
-
 set_module_type(msvcrt_winetest win32cui)
 add_importlibs(msvcrt_winetest msvcrt kernel32)
 
index 6960a2a..ee35c8d 100644 (file)
@@ -16,7 +16,9 @@ add_idl_headers(xmlparser_idlheader_test xmlparser.idl)
 add_dependencies(msxml3_winetest xmlparser_idlheader_test)
 set_module_type(msxml3_winetest win32cui)
 add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(msxml3_winetest ntdll)
 endif()
+
 add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin FOR all)
index a9297e5..dcbbeca 100644 (file)
@@ -1,6 +1,4 @@
 
-add_definitions(-D__ROS_LONG64__)
-
 list(APPEND SOURCE
     access.c
     apibuf.c
@@ -9,7 +7,7 @@ list(APPEND SOURCE
     testlist.c)
 
 add_executable(netapi32_winetest ${SOURCE})
-target_link_libraries(netapi32_winetest wine)
+target_link_libraries(netapi32_winetest)
 set_module_type(netapi32_winetest win32cui)
-add_importlibs(netapi32_winetest advapi32 msvcrt kernel32 ntdll)
+add_importlibs(netapi32_winetest advapi32 msvcrt kernel32)
 add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all)
index 872874c..6f3527d 100644 (file)
@@ -30,6 +30,7 @@ add_executable(ntdll_winetest ${SOURCE})
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all)
+
 if(NOT MSVC)
     allow_warnings(ntdll_winetest)
     add_target_compile_flags(ntdll_winetest "-Wno-format")
index bf4c9be..784b9e7 100644 (file)
@@ -27,13 +27,14 @@ set(tmarshal.rc_DEPS
     ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb)
 
 set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}")
-
 add_executable(oleaut32_winetest ${SOURCE} tmarshal.rc)
 target_link_libraries(oleaut32_winetest uuid)
 set_module_type(oleaut32_winetest win32cui)
 add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(oleaut32_winetest ntdll)
 endif()
+
 add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders)
 add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)
index 9deafba..ea53eb2 100644 (file)
@@ -2,7 +2,9 @@
 add_executable(pdh_winetest pdh.c testlist.c)
 set_module_type(pdh_winetest win32cui)
 add_importlibs(pdh_winetest pdh msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(pdh_winetest ntdll)
 endif()
+
 add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all)
index 7a1d022..f0c740f 100644 (file)
@@ -3,7 +3,9 @@ add_definitions(-DUSE_WINE_TODOS)
 add_executable(propsys_winetest propstore.c propsys.c testlist.c)
 set_module_type(propsys_winetest win32cui)
 add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(propsys_winetest ntdll)
 endif()
+
 add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all)
index d58b096..739f05e 100644 (file)
@@ -10,7 +10,9 @@ list(APPEND SOURCE
 add_executable(qmgr_winetest ${SOURCE})
 set_module_type(qmgr_winetest win32cui)
 add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(qmgr_winetest ntdll)
 endif()
+
 add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin FOR all)
index 086628c..9b2280a 100644 (file)
@@ -16,7 +16,9 @@ target_link_libraries(quartz_winetest uuid)
 add_dependencies(quartz_winetest quartz_test_idlheader)
 set_module_type(quartz_winetest win32cui)
 add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(quartz_winetest ntdll)
 endif()
+
 add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all)
index 653100e..45bb7e3 100644 (file)
@@ -1,8 +1,4 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(regedit_winetest regedit.c testlist.c)
 target_link_libraries(regedit_winetest wine)
 set_module_type(regedit_winetest win32cui)
index 4689921..f2b1144 100644 (file)
@@ -2,11 +2,8 @@
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
 add_definitions(-DUSE_WINE_TODOS)
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-    
 set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
-
 add_rpc_files(client server.idl)
 add_rpc_files(server server.idl)
 unset(IDL_FLAGS)
@@ -29,11 +26,7 @@ if(MSVC)
 endif()
 
 add_executable(rpcrt4_winetest ${SOURCE})
-target_link_libraries(rpcrt4_winetest
-    uuid
-    wine
-    ${PSEH_LIB})
-
+target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB})
 set_module_type(rpcrt4_winetest win32cui)
 add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll)
 add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)
index 8be7587..d696f5a 100644 (file)
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(serialui_winetest confdlg.c testlist.c)
-target_link_libraries(serialui_winetest wine)
 set_module_type(serialui_winetest win32cui)
-add_importlibs(serialui_winetest msvcrt kernel32 ntdll)
+add_importlibs(serialui_winetest msvcrt kernel32)
 add_cd_file(TARGET serialui_winetest DESTINATION reactos/bin FOR all)
index 3cbd46b..065eca3 100644 (file)
@@ -1,7 +1,5 @@
 
-add_definitions(-D__ROS_LONG64__)
 add_executable(services_winetest service.c testlist.c)
-target_link_libraries(services_winetest wine)
 set_module_type(services_winetest win32cui)
-add_importlibs(services_winetest advapi32 msvcrt kernel32 ntdll)
+add_importlibs(services_winetest advapi32 msvcrt kernel32)
 add_cd_file(TARGET services_winetest DESTINATION reactos/bin FOR all)
index e42a50c..525bd5f 100644 (file)
@@ -28,7 +28,9 @@ add_executable(shell32_winetest ${SOURCE})
 target_link_libraries(shell32_winetest uuid)
 set_module_type(shell32_winetest win32cui)
 add_importlibs(shell32_winetest shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(shell32_winetest ntdll)
 endif()
+
 add_cd_file(TARGET shell32_winetest DESTINATION reactos/bin FOR all)
index 9d7d798..400cba1 100644 (file)
@@ -19,7 +19,9 @@ add_executable(shlwapi_winetest ${SOURCE})
 target_link_libraries(shlwapi_winetest uuid)
 set_module_type(shlwapi_winetest win32cui)
 add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(shlwapi_winetest ntdll)
 endif()
+
 add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all)
index eb2241f..39934b9 100644 (file)
@@ -1,11 +1,6 @@
 
 add_definitions(-DUSE_WINE_TODOS)
-
-add_executable(sxs_winetest
-    cache.c
-    name.c
-    testlist.c)
-
+add_executable(sxs_winetest cache.c name.c testlist.c)
 set_module_type(sxs_winetest win32cui)
 add_importlibs(sxs_winetest sxs msvcrt kernel32)
 add_cd_file(TARGET sxs_winetest DESTINATION reactos/bin FOR all)
index 48a9354..6c83d54 100644 (file)
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(userenv_winetest userenv.c testlist.c)
-target_link_libraries(userenv_winetest wine)
 set_module_type(userenv_winetest win32cui)
-add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32 ntdll)
+add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32)
 add_cd_file(TARGET userenv_winetest DESTINATION reactos/bin FOR all)
index fe60e58..b8f4a20 100644 (file)
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(uxtheme_winetest system.c testlist.c)
-target_link_libraries(uxtheme_winetest wine)
 set_module_type(uxtheme_winetest win32cui)
-add_importlibs(uxtheme_winetest user32 msvcrt kernel32 ntdll)
+add_importlibs(uxtheme_winetest user32 msvcrt kernel32)
 add_cd_file(TARGET uxtheme_winetest DESTINATION reactos/bin FOR all)
index 9d76b69..994c0a4 100644 (file)
@@ -9,7 +9,9 @@ list(APPEND SOURCE
 add_executable(version_winetest ${SOURCE} version.rc)
 set_module_type(version_winetest win32cui)
 add_importlibs(version_winetest version msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(version_winetest ntdll)
 endif()
+
 add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all)
index 81eb815..d297d89 100644 (file)
@@ -19,7 +19,9 @@ list(APPEND SOURCE
 add_executable(windowscodecs_winetest ${SOURCE})
 set_module_type(windowscodecs_winetest win32cui)
 add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 msvcrt kernel32)
+
 if(MSVC)
     add_importlibs(windowscodecs_winetest ntdll)
 endif()
+
 add_cd_file(TARGET windowscodecs_winetest DESTINATION reactos/bin FOR all)
index 3362986..5b7de9f 100644 (file)
@@ -1,9 +1,5 @@
 
-list(APPEND SOURCE
-    transform.c
-    testlist.c)
-
-add_executable(windowscodecsext_winetest ${SOURCE})
+add_executable(windowscodecsext_winetest transform.c testlist.c)
 set_module_type(windowscodecsext_winetest win32cui)
 add_importlibs(windowscodecsext_winetest ole32 windowscodecsext msvcrt kernel32)
 add_cd_file(TARGET windowscodecsext_winetest DESTINATION reactos/bin FOR all)
index e15cec2..f762ea8 100644 (file)
@@ -1,6 +1,4 @@
 
-add_definitions(-D__ROS_LONG64__)
-
 list(APPEND SOURCE
     capture.c
     mci.c
@@ -11,9 +9,9 @@ list(APPEND SOURCE
     wave.c)
 
 add_executable(winmm_winetest ${SOURCE})
-target_link_libraries(winmm_winetest wine dxguid)
+target_link_libraries(winmm_winetest dxguid)
 set_module_type(winmm_winetest win32cui)
-add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll)
+add_importlibs(winmm_winetest winmm user32 msvcrt kernel32)
 add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all)
 
 if(NOT MSVC)
index 5e7ad1d..573b4e3 100644 (file)
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(wlanapi_winetest wlanapi.c testlist.c)
-target_link_libraries(wlanapi_winetest wine)
 set_module_type(wlanapi_winetest win32cui)
-add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32 ntdll)
+add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32)
 add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all)