dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2025-02-17 17:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use SDL GLimp and input implementations on Windows

Browse source 
The DirectX SDK is not required anymore.
This commit is contained in:
dhewg 2011-12-30 01:05:42 +01:00 committed by Daniel Gibson
parent 7dd30d9db6
commit 5fa6e06748
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -214,19 +214,10 @@ if (WIN32)
add_definitions(-D_WIN32_WINNT=0x0501) add_definitions(-D_WIN32_WINNT=0x0501)
set(sys_libs ${sys_libs} set(sys_libs ${sys_libs}
dinput8
ksuser
dxguid
winmm winmm
iphlpapi iphlpapi
wsock32 wsock32
) )
if (MINGW)
list(APPEND sys_libs dxerr8)
else()
list(APPEND sys_libs dxerr)
endif()
endif() endif()
message(STATUS "Building ${CMAKE_BUILD_TYPE} for ${os}.${cpu}") message(STATUS "Building ${CMAKE_BUILD_TYPE} for ${os}.${cpu}")
@ -655,17 +646,15 @@ elseif (WIN32)
set(src_sys_base set(src_sys_base
sys/cpu.cpp sys/cpu.cpp
sys/threads.cpp sys/threads.cpp
sys/glimp.cpp
sys/events.cpp
sys/sys_local.cpp sys/sys_local.cpp
sys/win32/win_cpu.cpp sys/win32/win_cpu.cpp
# sys/win32/win_gamma.cpp
sys/win32/win_glimp.cpp
sys/win32/win_input.cpp sys/win32/win_input.cpp
sys/win32/win_main.cpp sys/win32/win_main.cpp
sys/win32/win_net.cpp sys/win32/win_net.cpp
sys/win32/win_shared.cpp sys/win32/win_shared.cpp
sys/win32/win_syscon.cpp sys/win32/win_syscon.cpp
sys/win32/win_taskkeyhook.cpp
sys/win32/win_wndproc.cpp
) )
set(src_sys_core set(src_sys_core

3
idlib/precompiled.h
View file

@ -44,9 +44,6 @@ If you have questions concerning this license or the applicable additional terms
#include <mmsystem.h> #include <mmsystem.h>
#include <mmreg.h> #include <mmreg.h>
#define DIRECTINPUT_VERSION 0x0800 // was 0x0700 with the old mssdk
#include <dinput.h>
#pragma warning(disable : 4100) // unreferenced formal parameter #pragma warning(disable : 4100) // unreferenced formal parameter
#pragma warning(disable : 4244) // conversion to smaller type, possible loss of data #pragma warning(disable : 4244) // conversion to smaller type, possible loss of data
#pragma warning(disable : 4714) // function marked as __forceinline not inlined #pragma warning(disable : 4714) // function marked as __forceinline not inlined