[CMAKE]

Revert r50434. Insetad add __WINESRC__ definition to amstream and avifil32 winetests

svn path=/trunk/; revision=50435

diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index fb89f46..195194d 100644 (file)
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -1,6 +1,4 @@
 
 

-add_definitions(-D__WINESRC__)
-

 add_subdirectory(advapi32)
 add_subdirectory(advpack)
 add_subdirectory(amstream)
 add_subdirectory(advapi32)
 add_subdirectory(advpack)
 add_subdirectory(amstream)

diff --git a/rostests/winetests/amstream/CMakeLists.txt b/rostests/winetests/amstream/CMakeLists.txt
index c239618..9d87929 100644 (file)
--- a/rostests/winetests/amstream/CMakeLists.txt
+++ b/rostests/winetests/amstream/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D_DLL -D__USE_CRTIMP -D__WINESRC__)

 add_executable(amstream_winetest amstream.c testlist.c)
 target_link_libraries(amstream_winetest wine uuid)
 set_module_type(amstream_winetest win32cui)
 add_executable(amstream_winetest amstream.c testlist.c)
 target_link_libraries(amstream_winetest wine uuid)
 set_module_type(amstream_winetest win32cui)

diff --git a/rostests/winetests/avifil32/CMakeLists.txt b/rostests/winetests/avifil32/CMakeLists.txt
index 7bb5d27..32f03fa 100644 (file)
--- a/rostests/winetests/avifil32/CMakeLists.txt
+++ b/rostests/winetests/avifil32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D_DLL -D__USE_CRTIMP -D__ROS_LONG64__)

 add_executable(avifil32_winetest api.c testlist.c)
 target_link_libraries(avifil32_winetest wine)
 set_module_type(avifil32_winetest win32cui)
 add_executable(avifil32_winetest api.c testlist.c)
 target_link_libraries(avifil32_winetest wine)
 set_module_type(avifil32_winetest win32cui)