[DLLS]

Make sure include/reactos/wine is included BEFORE PSDK headers. (I didn't tackle all DLLs, only those that (will) need it) svn path=/trunk/; revision=66716
2024-06-30 01:42:30 +00:00 · 2015-03-14 23:34:31 +00:00 · 2015-03-14 23:34:31 +00:00 · 87d23adf45
parent 37e0c5bcb5
commit 87d23adf45
20 changed files with 20 additions and 20 deletions
--- a/reactos/dll/win32/advpack/CMakeLists.txt
+++ b/reactos/dll/win32/advpack/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(advpack.dll advpack.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/comdlg32/CMakeLists.txt
+++ b/reactos/dll/win32/comdlg32/CMakeLists.txt
@ -3,7 +3,7 @@ add_definitions(
    -D__WINESRC__
    -D_WINE)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/dbghelp/CMakeLists.txt
+++ b/reactos/dll/win32/dbghelp/CMakeLists.txt
@ -39,7 +39,7 @@ else()
    endif()

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

    spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB)
--- a/reactos/dll/win32/imagehlp/CMakeLists.txt
+++ b/reactos/dll/win32/imagehlp/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D_IMAGEHLP_SOURCE_)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/mapi32/CMakeLists.txt
+++ b/reactos/dll/win32/mapi32/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(mapi32.dll mapi32.spec)

 list(APPEND SOURCE
--- a/reactos/dll/win32/msctf/CMakeLists.txt
+++ b/reactos/dll/win32/msctf/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(msctf.dll msctf.spec)

 list(APPEND SOURCE
--- a/reactos/dll/win32/mstask/CMakeLists.txt
+++ b/reactos/dll/win32/mstask/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 generate_idl_iids(mstask_local.idl)
 spec2def(mstask.dll mstask.spec)

--- a/reactos/dll/win32/msvfw32/CMakeLists.txt
+++ b/reactos/dll/win32/msvfw32/CMakeLists.txt
@ -1,7 +1,7 @@

 add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/ole32/CMakeLists.txt
+++ b/reactos/dll/win32/ole32/CMakeLists.txt
@ -10,7 +10,7 @@ add_definitions(
    -DPROXY_CLSID=CLSID_PSFactoryBuffer
    -DWINE_REGISTER_DLL)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(ole32.dll ole32.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS)
 generate_idl_iids(dcom.idl)
 add_idl_headers(ole32idl dcom.idl irot.idl)
--- a/reactos/dll/win32/oleaut32/CMakeLists.txt
+++ b/reactos/dll/win32/oleaut32/CMakeLists.txt
@ -11,7 +11,7 @@ add_definitions(
    -DENTRY_PREFIX=OLEAUTPS_
    -DPROXY_CLSID=CLSID_PSFactoryBuffer)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB)
 add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl)

--- a/reactos/dll/win32/rpcrt4/CMakeLists.txt
+++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB)
 add_rpc_files(client epm.idl)

--- a/reactos/dll/win32/shlwapi/CMakeLists.txt
+++ b/reactos/dll/win32/shlwapi/CMakeLists.txt
@ -5,7 +5,7 @@ add_definitions(
    -D__WINESRC__
    -D_SHLWAPI_)

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/twain_32/CMakeLists.txt
+++ b/reactos/dll/win32/twain_32/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 spec2def(twain_32.dll twain_32.spec)

--- a/reactos/dll/win32/usp10/CMakeLists.txt
+++ b/reactos/dll/win32/usp10/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 spec2def(usp10.dll usp10.spec ADD_IMPORTLIB)

--- a/reactos/dll/win32/version/CMakeLists.txt
+++ b/reactos/dll/win32/version/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(version.dll version.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/wbemprox/CMakeLists.txt
+++ b/reactos/dll/win32/wbemprox/CMakeLists.txt
@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(wbemprox.dll wbemprox.spec)

 list(APPEND SOURCE
--- a/reactos/dll/win32/windowscodecs/CMakeLists.txt
+++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt
@ -9,7 +9,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(
-    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine
    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
    ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib
    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng
--- a/reactos/dll/win32/winmm/CMakeLists.txt
+++ b/reactos/dll/win32/winmm/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D_WINE)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(winmm.dll winmm.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/reactos/dll/win32/winscard/CMakeLists.txt
+++ b/reactos/dll/win32/winscard/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(winscard.dll winscard.spec)

 list(APPEND SOURCE
--- a/reactos/dll/win32/wintrust/CMakeLists.txt
+++ b/reactos/dll/win32/wintrust/CMakeLists.txt
@ -1,6 +1,6 @@

 add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB)

 list(APPEND SOURCE