Fix DXSDK include order

--HG--
branch : develop

code/CMakeModules/nel.cmake

@@ -1147,6 +1147,14 @@ MACRO(SETUP_EXTERNAL)
     INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
   ENDIF(WITH_STLPORT)
 
+  IF(WIN32)
+    # Must include DXSDK before WINSDK
+    FIND_PACKAGE(DirectXSDK REQUIRED)
+    # IF(DXSDK_INCLUDE_DIR)
+    #   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+    # ENDIF()
+  ENDIF(WIN32)
+
   IF(MSVC)
     FIND_PACKAGE(MSVC REQUIRED)
     FIND_PACKAGE(WindowsSDK REQUIRED)

code/nel/CMakeLists.txt

@@ -4,11 +4,7 @@ IF(WITH_STATIC_DRIVERS)
   ADD_DEFINITIONS(-DNL_STATIC)
 ENDIF(WITH_STATIC_DRIVERS)
 
-# On Windows we need to find DirectInput for NLMISC.
-# This is how we get events.
 IF(WIN32)
-  FIND_PACKAGE(DirectXSDK REQUIRED)
-
   # On Win32 we can also build the MAX plugins.
   IF(WITH_NEL_MAXPLUGIN)
     FIND_PACKAGE(3dsMaxSDK)

code/nel/src/3d/driver/direct3d/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h *.def)
 
 NL_TARGET_DRIVER(nel_drv_direct3d_win ${SRC})
 
-INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d nelmisc ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
 

code/nel/src/3d/driver/opengl/CMakeLists.txt

@@ -35,7 +35,7 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB})
 NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB})
 
 IF(WIN32)
-  INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
   ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS)
 ENDIF(WIN32)

code/nel/src/3d/driver/opengles/CMakeLists.txt

@@ -38,7 +38,7 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGLES_LIB})
 NL_ADD_RUNTIME_FLAGS(${NLDRV_OGLES_LIB})
 
 IF(WIN32)
-  INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
   ADD_DEFINITIONS(/DDRIVER_OPENGLES_EXPORTS)
 ENDIF(WIN32)

code/nel/src/misc/CMakeLists.txt

@@ -196,7 +196,7 @@ ENDIF(WITH_STATIC OR WIN32)
 
 # For DirectInput (di_event_emitter)
 IF(WIN32)
-  INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(nelmisc ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY} winmm dbghelp)
 ENDIF(WIN32)
 

code/nel/src/sound/driver/dsound/CMakeLists.txt

@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h *.def)
 
 NL_TARGET_DRIVER(nel_drv_dsound_win ${SRC})
 
-INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_drv_dsound_win nelmisc nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY})
 
 NL_DEFAULT_PROPS(nel_drv_dsound_win "NeL, Driver, Sound: DirectSound")

code/nel/src/sound/driver/xaudio2/CMakeLists.txt

@@ -28,7 +28,7 @@ SOURCE_GROUP(efx FILES
 		
 NL_TARGET_DRIVER(nel_drv_xaudio2_win ${SRC})
 
-INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_drv_xaudio2_win nelmisc nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY} ${DXSDK_GUID_LIBRARY})
 

code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt

@@ -1,17 +1,6 @@
 
 FILE(GLOB SRC *.cpp *.h)
 
-# Bugfix...
-IF (NOT DXSDK_INCLUDE_DIR)
-	IF (DXSDK_DIR)
-		SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
-	ENDIF (DXSDK_DIR)
-ENDIF (NOT DXSDK_INCLUDE_DIR)
-
-IF (NOT DXSDK_INCLUDE_DIR)
-	message(FATAL_ERROR "Configuration bad, cannot find DirectX include.")
-ENDIF (NOT DXSDK_INCLUDE_DIR)
-
 ADD_LIBRARY(georges_plugin_sound SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(georges_plugin_sound ${NEL_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR})