[ros-diffs] [tkreuzer] 66716: [DLLS] Make sure include/reactos/wine is included BEFORE PSDK headers. (I didn't tackle all DLLs, only those that (will) need it)

Author: tkreuzer
Date: Sat Mar 14 23:34:31 2015
New Revision: 66716

URL: http://svn.reactos.org/svn/reactos?rev=66716&view=rev
Log:
[DLLS]
Make sure include/reactos/wine is included BEFORE PSDK headers. (I didn't tackle all
DLLs, only those that (will) need it)

Modified:
    trunk/reactos/dll/win32/advpack/CMakeLists.txt
    trunk/reactos/dll/win32/comdlg32/CMakeLists.txt
    trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
    trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
    trunk/reactos/dll/win32/mapi32/CMakeLists.txt
    trunk/reactos/dll/win32/msctf/CMakeLists.txt
    trunk/reactos/dll/win32/mstask/CMakeLists.txt
    trunk/reactos/dll/win32/msvfw32/CMakeLists.txt
    trunk/reactos/dll/win32/ole32/CMakeLists.txt
    trunk/reactos/dll/win32/oleaut32/CMakeLists.txt
    trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
    trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
    trunk/reactos/dll/win32/twain_32/CMakeLists.txt
    trunk/reactos/dll/win32/usp10/CMakeLists.txt
    trunk/reactos/dll/win32/version/CMakeLists.txt
    trunk/reactos/dll/win32/wbemprox/CMakeLists.txt
    trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt
    trunk/reactos/dll/win32/winmm/CMakeLists.txt
    trunk/reactos/dll/win32/winscard/CMakeLists.txt
    trunk/reactos/dll/win32/wintrust/CMakeLists.txt

Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/advpack/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -3,7 +3,7 @@
     -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

Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -39,7 +39,7 @@
     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)

Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/mstask/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mstask/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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)
 

Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -10,7 +10,7 @@
     -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)

Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -11,7 +11,7 @@
     -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)
 

Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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)
 

Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -5,7 +5,7 @@
     -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

Modified: trunk/reactos/dll/win32/twain_32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/twain_32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/twain_32/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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)
 

Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/usp10/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/usp10/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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)
 

Modified: trunk/reactos/dll/win32/version/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/version/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/version/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -3,7 +3,7 @@
 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

Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM…
==============================================================================
--- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31
2015
@@ -9,7 +9,7 @@
 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

Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/winmm/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winmm/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/winscard/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/winscard/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winscard/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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

Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt	[iso-8859-1] Sat Mar 14 23:34:31 2015
@@ -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