Cmake build updates for Win32

doomsday/CMakeLists.txt

@@ -13,6 +13,7 @@ SET(ENV{SDLDIR} "C:/SDK/SDL")
 SET(ENV{OPENALDIR} "C:/SDK/OPENAL")
 SET(ENV{ZLIBDIR} "C:/SDK/ZLIB")
 SET(ENV{LIBPNGDIR} "C:/SDK/LIBPNG")
+SET(ENV{DIRECTXDIR} "C:/SDK/DX9SDK")
 ENDIF (WIN32)
 ################################################################################
 ######################## Configure Build Options  ##############################
@@ -149,6 +150,10 @@ IF (UNIX)
 INCLUDE (FindCurses)
 ENDIF (UNIX)
 
+IF (WIN32)
+INCLUDE (${CMAKE_SOURCE_DIR}/build/cmake/FindDX_Dinput.cmake)
+ENDIF (WIN32)
+
 IF (NOT BUILDDEDICATED)
 IF (UNIX)
 IF (NOT APPLE)
@@ -174,13 +179,18 @@ ENDIF (NOT BUILDDEDICATED AND NOT BUILDOPENAL AND NOT BUILDSDLMIXER)
 ######################## Set Common Definitions  ###############################
 ##ADD_DEFINITIONS (-DNORANGECHECKING)
 
-IF (WIN32 OR CMAKE_SYSTEM_MACHINE MATCHES "i.86")
+IF (NOT MSVC)
+IF (CMAKE_SYSTEM_MACHINE MATCHES "i.86" OR MAKE_SYSTEM_MACHINE MATCHES "x86")
 ADD_DEFINITIONS (-DGNU_X86_FIXED_ASM )
 SET (BUILDFIXEDASM ON)
-ELSE (WIN32 OR CMAKE_SYSTEM_MACHINE MATCHES "i.86")
+ELSE (CMAKE_SYSTEM_MACHINE MATCHES "i.86" OR MAKE_SYSTEM_MACHINE MATCHES "x86")
+ADD_DEFINITIONS (-DNO_FIXED_ASM )
+SET (BUILDFIXEDASM OFF)
+ENDIF (CMAKE_SYSTEM_MACHINE MATCHES "i.86" OR MAKE_SYSTEM_MACHINE MATCHES "x86")
+ELSE (NOT MSVC)
 ADD_DEFINITIONS (-DNO_FIXED_ASM )
 SET (BUILDFIXEDASM OFF)
-ENDIF (WIN32 OR CMAKE_SYSTEM_MACHINE MATCHES "i.86")
+ENDIF (NOT MSVC)
 
 ## Apple also needs -DUNIX in places
 IF (UNIX)
@@ -193,6 +203,9 @@ ENDIF (UNIX)
 IF (WIN32)
 ADD_DEFINITIONS ( -DWIN32)
 SET (BUILDSYSTEM WIN32)
+IF (MSVC80)
+ADD_DEFINITIONS ( -D_CRT_SECURE_NO_DEPRECATE)
+ENDIF (MSVC80)
 ENDIF (WIN32)
 
 IF (APPLE)
@@ -297,6 +310,16 @@ INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR})
 ENDIF (NOT APPLE)
 ENDIF (UNIX)
 
+## Confirm we have DirectX
+IF (WIN32)
+IF (NOT DIRECTX_DINPUT_FOUND STREQUAL "YES")
+MESSAGE (FATAL_ERROR
+"** DirectX Dinput not found.
+On Windows install dx9sdk.exe.")
+ENDIF (NOT DIRECTX_DINPUT_FOUND  STREQUAL "YES")
+INCLUDE_DIRECTORIES (${DIRECTX_DINPUT_INCLUDE_DIR})
+ENDIF (WIN32)
+
 IF (BUILDOPENAL)
 ## Confirm we have OpenAL
 IF (NOT OPENAL_FOUND STREQUAL "YES")
@@ -371,7 +394,16 @@ ENDIF (UNIX)
 
 IF (WIN32)
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/engine/win32/include )
-FILE(GLOB DENG_WIN32_SOURCES ${CMAKE_SOURCE_DIR}/engine/win32/src/*.c)
+##FILE(GLOB DENG_WIN32_SOURCES ${CMAKE_SOURCE_DIR}/engine/win32/src/*.c)
+SET (DENG_WIN32_SOURCES
+${CMAKE_SOURCE_DIR}/engine/win32/src/dd_winit.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_console.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_findfile.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_input.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_mixer.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_musd_win.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_sfxd_loader.c
+${CMAKE_SOURCE_DIR}/engine/win32/src/sys_stwin.c )
 
 SET (DENG_SOURCES ${DENG_SOURCES} ${DENG_WIN32_SOURCES})
 ENDIF (WIN32)

doomsday/build/cmake/FindDX_Dinput.cmake

@@ -0,0 +1,34 @@
+# - Find DirectX Direct Input
+# Find the DirectX includes and libraries
+#
+#  DIRECTX_DINPUT_INCLUDE_DIR - where to find dinput.h
+#  DIRECTX_DINPUT_LIBRARIES   - List of libraries when using DirectX DInput.
+#  DIRECTX_DINPUT_FOUND       - True if DirectX DInputfound.
+
+FIND_PATH(DIRECTX_DINPUT_INCLUDE_DIR dinput.h
+  $ENV{DIRECTXDIR}/include
+  /usr/local/include/directx
+  /usr/local/include
+  /usr/include
+)
+
+SET(DIRECTX_DINPUT_NAMES ${DIRECTX_DINPUT_NAMES} dinput)
+FIND_LIBRARY(DIRECTX_DINPUT_LIBRARY
+  NAMES ${DIRECTX_DINPUT_NAMES}
+  PATHS 
+  $ENV{DIRECTXDIR}/lib
+  /usr/lib
+  /usr/local/lib
+  /usr/local/lib/directx
+)
+
+IF(DIRECTX_INCLUDE_DIR)
+  IF(DIRECTX_DINPUT_LIBRARY)
+    SET( DIRECTX_DINPUT_LIBRARIES ${DIRECTX_DINPUT_LIBRARY} )
+  ENDIF(DIRECTX_DINPUT_LIBRARY)
+ENDIF(DIRECTX_INCLUDE_DIR)
+
+SET(DIRECTX_DINPUT_FOUND "NO")
+IF(DIRECTX_DINPUT_LIBRARY)
+  SET(DIRECTX_DINPUT_FOUND "YES")
+ENDIF(DIRECTX_DINPUT_LIBRARY)

doomsday/engine/portable/src/gl_main.c

@@ -53,7 +53,7 @@
 
 #if !defined(WIN32_GAMMA) && !defined(XFREE_GAMMA)
 #  define SDL_GAMMA
-#  include <SDL/SDL.h>
+#  include <SDL.h>
 #endif
 
 // MACROS ------------------------------------------------------------------