[CMAKE]

- Add ntdll apitest to build.

svn path=/trunk/; revision=50312

diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index 6b0ac2d..adbfb64 100644 (file)
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library(apitest apitest.c)
 
 add_subdirectory(dciman32)
 add_subdirectory(gdi32)
-#add_subdirectory(ntdll) The asm file needs to be fixed.
+add_subdirectory(ntdll)
 add_subdirectory(user32)
 
 if(ARCH MATCHES i386)

diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt
index 1e3de40..854a14a 100644 (file)
--- a/rostests/apitests/ntdll/CMakeLists.txt
+++ b/rostests/apitests/ntdll/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-#add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
     RtlInitializeBitMap.c
@@ -7,13 +7,11 @@ list(APPEND SOURCE
     testlist.c)
 
 if(ARCH MATCHES i386)
-list(APPEND SOURCE i386/ZwContinue.asm)
+    list(APPEND SOURCE i386/ZwContinue.S)
 endif()
 
 add_executable(ntdll_apitest ${SOURCE})
-target_link_libraries(ntdll_apitest wine
- #${PSEH_LIB}
- )
+target_link_libraries(ntdll_apitest wine)
 set_module_type(ntdll_apitest win32cui)
-add_importlibs(ntdll_apitest ntdll)
+add_importlibs(ntdll_apitest msvcrt kernel32 ntdll)
 add_cab_target(ntdll_apitest 7)