* Addendum to r71184. CORE-9111

svn path=/trunk/; revision=71185

diff --git a/rostests/apitests/atl/CMakeLists.txt b/rostests/apitests/atl/CMakeLists.txt
index db0bc08..591c7ef 100644 (file)
--- a/rostests/apitests/atl/CMakeLists.txt
+++ b/rostests/apitests/atl/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set_cpp(WITH_RUNTIME)
 
 
 set_cpp(WITH_RUNTIME)
 

-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)

 
 add_executable(atl_apitest
     CComBSTR.cpp
 
 add_executable(atl_apitest
     CComBSTR.cpp

diff --git a/rostests/apitests/shell32/CMakeLists.txt b/rostests/apitests/shell32/CMakeLists.txt
index 0855e5f..cc2e18e 100644 (file)
--- a/rostests/apitests/shell32/CMakeLists.txt
+++ b/rostests/apitests/shell32/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set_cpp(WITH_RUNTIME)
 
 
 set_cpp(WITH_RUNTIME)
 

-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)

 
 add_executable(shell32_apitest
     CMyComputer.cpp
 
 add_executable(shell32_apitest
     CMyComputer.cpp

diff --git a/rostests/kmtests/CMakeLists.txt b/rostests/kmtests/CMakeLists.txt
index 0c2c5e3..7691f3e 100644 (file)
--- a/rostests/kmtests/CMakeLists.txt
+++ b/rostests/kmtests/CMakeLists.txt
@@ -100,11 +100,11 @@ add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all)
 
 add_library(kmtest_printf
     kmtest_drv/printf_stubs.c
 
 add_library(kmtest_printf
     kmtest_drv/printf_stubs.c

-    ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/strnlen.c
-    ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/wcsnlen.c
-    ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c)
+    ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/strnlen.c
+    ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/wcsnlen.c
+    ${REACTOS_SOURCE_DIR}/sdk/lib/crt/printf/streamout.c)

 add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb)
 add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb)

-add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
+add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/sdk/lib/crt/include)

 
 #
 # kmtest.exe loader application
 
 #
 # kmtest.exe loader application

diff --git a/rostests/rosautotest/CMakeLists.txt b/rostests/rosautotest/CMakeLists.txt
index 18af314..05cf7ec 100644 (file)
--- a/rostests/rosautotest/CMakeLists.txt
+++ b/rostests/rosautotest/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND SOURCE
     tools.cpp
     precomp.h)
 
     tools.cpp
     precomp.h)
 

-add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/rosautotestmsg.rc)
+add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/sdk/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)
 set_module_type(rosautotest win32cui UNICODE)
 add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)
 add_pch(rosautotest precomp.h SOURCE)

diff --git a/rostests/tests/mmixer_test/CMakeLists.txt b/rostests/tests/mmixer_test/CMakeLists.txt
index a71aaae..e91d5f1 100644 (file)
--- a/rostests/tests/mmixer_test/CMakeLists.txt
+++ b/rostests/tests/mmixer_test/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 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)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sound/mmixer)

 add_executable(mmixer_test test.c)
 set_module_type(mmixer_test win32cui)
 target_link_libraries(mmixer_test mmixer)
 add_executable(mmixer_test test.c)
 set_module_type(mmixer_test win32cui)
 target_link_libraries(mmixer_test mmixer)

diff --git a/rostests/winetests/advapi32/CMakeLists.txt b/rostests/winetests/advapi32/CMakeLists.txt
index f0fad3a..8d5e3de 100644 (file)
--- a/rostests/winetests/advapi32/CMakeLists.txt
+++ b/rostests/winetests/advapi32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 
 list(APPEND SOURCE
     cred.c
 
 list(APPEND SOURCE
     cred.c

diff --git a/rostests/winetests/imm32/CMakeLists.txt b/rostests/winetests/imm32/CMakeLists.txt
index 27709a2..f145b44 100644 (file)
--- a/rostests/winetests/imm32/CMakeLists.txt
+++ b/rostests/winetests/imm32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 add_executable(imm32_winetest imm32.c testlist.c)
 set_module_type(imm32_winetest win32cui)
 add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32)
 add_executable(imm32_winetest imm32.c testlist.c)
 set_module_type(imm32_winetest win32cui)
 add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32)

diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index 5e14986..b409160 100644 (file)
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
 list(APPEND SOURCE
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
 list(APPEND SOURCE

diff --git a/rostests/winetests/localspl/CMakeLists.txt b/rostests/winetests/localspl/CMakeLists.txt
index eabb1c7..268487d 100644 (file)
--- a/rostests/winetests/localspl/CMakeLists.txt
+++ b/rostests/winetests/localspl/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 add_executable(localspl_winetest localmon.c testlist.c)
 set_module_type(localspl_winetest win32cui)
 add_importlibs(localspl_winetest advapi32 msvcrt kernel32)
 add_executable(localspl_winetest localmon.c testlist.c)
 set_module_type(localspl_winetest win32cui)
 add_importlibs(localspl_winetest advapi32 msvcrt kernel32)

diff --git a/rostests/winetests/localui/CMakeLists.txt b/rostests/winetests/localui/CMakeLists.txt
index 203263d..15c2fdc 100644 (file)
--- a/rostests/winetests/localui/CMakeLists.txt
+++ b/rostests/winetests/localui/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 add_executable(localui_winetest localui.c testlist.c)
 set_module_type(localui_winetest win32cui)
 add_importlibs(localui_winetest winspool msvcrt kernel32)
 add_executable(localui_winetest localui.c testlist.c)
 set_module_type(localui_winetest win32cui)
 add_importlibs(localui_winetest winspool msvcrt kernel32)

diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt
index c786e38..75bd7f8 100644 (file)
--- a/rostests/winetests/ntdll/CMakeLists.txt
+++ b/rostests/winetests/ntdll/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-D__WINESRC__)
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-D__WINESRC__)
 

diff --git a/rostests/winetests/oleaut32/CMakeLists.txt b/rostests/winetests/oleaut32/CMakeLists.txt
index 784b9e7..20813eb 100644 (file)
--- a/rostests/winetests/oleaut32/CMakeLists.txt
+++ b/rostests/winetests/oleaut32/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 add_definitions(-DUSE_WINE_TODOS)
 
 add_definitions(-DUSE_WINE_TODOS)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
 add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl)
 generate_idl_iids(test_reg.idl test_tlb.idl tmarshal.idl)
 add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
 add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl)
 generate_idl_iids(test_reg.idl test_tlb.idl tmarshal.idl)

diff --git a/rostests/winetests/oledlg/CMakeLists.txt b/rostests/winetests/oledlg/CMakeLists.txt
index e38e02f..c12f7e4 100644 (file)
--- a/rostests/winetests/oledlg/CMakeLists.txt
+++ b/rostests/winetests/oledlg/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 add_definitions(-DUSE_WINE_TODOS)
 
 add_definitions(-DUSE_WINE_TODOS)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 add_executable(oledlg_winetest main.c testlist.c)
 set_module_type(oledlg_winetest win32cui)
 add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32)
 add_executable(oledlg_winetest main.c testlist.c)
 set_module_type(oledlg_winetest win32cui)
 add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32)

diff --git a/rostests/winetests/quartz/CMakeLists.txt b/rostests/winetests/quartz/CMakeLists.txt
index 9442fd6..d038f32 100644 (file)
--- a/rostests/winetests/quartz/CMakeLists.txt
+++ b/rostests/winetests/quartz/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 
 list(APPEND SOURCE
     avisplitter.c
 
 list(APPEND SOURCE
     avisplitter.c

diff --git a/rostests/winetests/ws2_32/CMakeLists.txt b/rostests/winetests/ws2_32/CMakeLists.txt
index 4d7dde1..55593ff 100644 (file)
--- a/rostests/winetests/ws2_32/CMakeLists.txt
+++ b/rostests/winetests/ws2_32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

 
 add_executable(ws2_32_winetest protocol.c sock.c testlist.c)
 set_module_type(ws2_32_winetest win32cui)
 
 add_executable(ws2_32_winetest protocol.c sock.c testlist.c)
 set_module_type(ws2_32_winetest win32cui)