From 655b467d9a0af46490ec7782516ec14609c4b9b3 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 23 Sep 2013 21:54:01 +0000 Subject: [PATCH] [GDI32_APITEST] * Fix GCC warnings. * Enable -Werror again. * Remove redundant test header inclusion. * Speedup linking. svn path=/trunk/; revision=60347 --- rostests/apitests/gdi32/AddFontResource.c | 3 +-- rostests/apitests/gdi32/CMakeLists.txt | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/rostests/apitests/gdi32/AddFontResource.c b/rostests/apitests/gdi32/AddFontResource.c index 6a67699d932..8f6aede8711 100644 --- a/rostests/apitests/gdi32/AddFontResource.c +++ b/rostests/apitests/gdi32/AddFontResource.c @@ -5,9 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ +#include #include - -#include #include #define COUNT 26 diff --git a/rostests/apitests/gdi32/CMakeLists.txt b/rostests/apitests/gdi32/CMakeLists.txt index d63a1830600..136ee4116ca 100644 --- a/rostests/apitests/gdi32/CMakeLists.txt +++ b/rostests/apitests/gdi32/CMakeLists.txt @@ -1,5 +1,4 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/win32ss) list(APPEND SOURCE @@ -62,14 +61,8 @@ list(APPEND SOURCE init.c testlist.c) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(gdi32_apitest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_executable(gdi32_apitest ${SOURCE}) -target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) +target_link_libraries(gdi32_apitest ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui) -add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32) add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin FOR all) -- 2.17.1