mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 22:56:00 +00:00
[ROSTESTS]
* Addendum to my previous commit. svn path=/trunk/; revision=56131
This commit is contained in:
parent
9f44331d44
commit
d2b625c52f
4 changed files with 36 additions and 24 deletions
|
@ -7,8 +7,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
remove_definitions(-D_WIN32_IE=0x600)
|
remove_definitions(-D_WIN32_IE=0x600)
|
||||||
add_definitions(-D_WIN32_IE=0x500)
|
add_definitions(-D_WIN32_IE=0x500)
|
||||||
|
|
||||||
set_rc_compiler()
|
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
comboex.c
|
comboex.c
|
||||||
datetime.c
|
datetime.c
|
||||||
|
@ -31,17 +29,21 @@ list(APPEND SOURCE
|
||||||
trackbar.c
|
trackbar.c
|
||||||
treeview.c
|
treeview.c
|
||||||
updown.c
|
updown.c
|
||||||
testlist.c
|
testlist.c)
|
||||||
|
|
||||||
|
add_executable(comctl32_winetest
|
||||||
|
${SOURCE}
|
||||||
rsrc.rc)
|
rsrc.rc)
|
||||||
|
|
||||||
add_executable(comctl32_winetest ${SOURCE})
|
|
||||||
target_link_libraries(comctl32_winetest wine)
|
target_link_libraries(comctl32_winetest wine)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
target_link_libraries(comctl32_winetest uuid)
|
target_link_libraries(comctl32_winetest uuid)
|
||||||
else()
|
else()
|
||||||
add_target_compile_flags(comctl32_winetest "-Wno-format")
|
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||||
allow_warnings(comctl32_winetest)
|
#add_target_compile_flags(comctl32_winetest "-Wno-format")
|
||||||
|
#allow_warnings(comctl32_winetest)
|
||||||
|
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_module_type(comctl32_winetest win32cui)
|
set_module_type(comctl32_winetest win32cui)
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
|
|
||||||
set_rc_compiler()
|
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-D__ROS_LONG64__
|
-D__ROS_LONG64__
|
||||||
-D_DLL -D__USE_CRTIMP)
|
-D_DLL -D__USE_CRTIMP)
|
||||||
|
@ -22,11 +20,18 @@ list(APPEND SOURCE
|
||||||
palette.c
|
palette.c
|
||||||
path.c
|
path.c
|
||||||
pen.c
|
pen.c
|
||||||
testlist.c
|
testlist.c)
|
||||||
|
|
||||||
|
add_executable(gdi32_winetest
|
||||||
|
${SOURCE}
|
||||||
resource.rc)
|
resource.rc)
|
||||||
|
|
||||||
add_executable(gdi32_winetest ${SOURCE})
|
if(NOT MSVC)
|
||||||
allow_warnings(gdi32_winetest)
|
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||||
|
#allow_warnings(gdi32_winetest)
|
||||||
|
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
|
||||||
|
endif()
|
||||||
|
|
||||||
set_module_type(gdi32_winetest win32cui)
|
set_module_type(gdi32_winetest win32cui)
|
||||||
add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll)
|
add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll)
|
||||||
add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)
|
add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)
|
||||||
|
|
|
@ -4,8 +4,6 @@ add_definitions(
|
||||||
|
|
||||||
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
|
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
|
||||||
|
|
||||||
set_rc_compiler()
|
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
actctx.c
|
actctx.c
|
||||||
alloc.c
|
alloc.c
|
||||||
|
@ -42,16 +40,21 @@ list(APPEND SOURCE
|
||||||
virtual.c
|
virtual.c
|
||||||
volume.c
|
volume.c
|
||||||
dosdev.c
|
dosdev.c
|
||||||
testlist.c
|
testlist.c)
|
||||||
|
|
||||||
|
add_executable(kernel32_winetest
|
||||||
|
${SOURCE}
|
||||||
resource.rc)
|
resource.rc)
|
||||||
|
|
||||||
add_executable(kernel32_winetest ${SOURCE})
|
|
||||||
target_link_libraries(kernel32_winetest wine)
|
target_link_libraries(kernel32_winetest wine)
|
||||||
set_module_type(kernel32_winetest win32cui)
|
set_module_type(kernel32_winetest win32cui)
|
||||||
add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
|
add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
add_target_compile_flags(kernel32_winetest "-Wno-format")
|
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||||
allow_warnings(kernel32_winetest)
|
#add_target_compile_flags(kernel32_winetest "-Wno-format")
|
||||||
|
#allow_warnings(kernel32_winetest)
|
||||||
|
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
|
add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-D__ROS_LONG64__)
|
-D__ROS_LONG64__)
|
||||||
|
|
||||||
set_rc_compiler()
|
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
broadcast.c
|
broadcast.c
|
||||||
class.c
|
class.c
|
||||||
|
@ -29,15 +27,19 @@ list(APPEND SOURCE
|
||||||
win.c
|
win.c
|
||||||
winstation.c
|
winstation.c
|
||||||
wsprintf.c
|
wsprintf.c
|
||||||
testlist.c
|
testlist.c)
|
||||||
|
|
||||||
|
add_executable(user32_winetest
|
||||||
|
${SOURCE}
|
||||||
resource.rc)
|
resource.rc)
|
||||||
|
|
||||||
add_executable(user32_winetest ${SOURCE})
|
|
||||||
target_link_libraries(user32_winetest wine)
|
target_link_libraries(user32_winetest wine)
|
||||||
set_module_type(user32_winetest win32cui)
|
set_module_type(user32_winetest win32cui)
|
||||||
add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll)
|
add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll)
|
||||||
add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all)
|
add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
add_target_compile_flags(user32_winetest "-Wno-format")
|
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||||
endif()
|
#add_target_compile_flags(user32_winetest "-Wno-format")
|
||||||
|
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format")
|
||||||
|
endif()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue