From 5fa6e06748c3e9d485a69c7b69cbd29c62072675 Mon Sep 17 00:00:00 2001 From: dhewg Date: Fri, 30 Dec 2011 01:05:42 +0100 Subject: [PATCH] Use SDL GLimp and input implementations on Windows The DirectX SDK is not required anymore. --- CMakeLists.txt | 15 ++------------- idlib/precompiled.h | 3 --- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d19fed0..fbcc8a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,19 +214,10 @@ if (WIN32) add_definitions(-D_WIN32_WINNT=0x0501) set(sys_libs ${sys_libs} - dinput8 - ksuser - dxguid winmm iphlpapi wsock32 ) - - if (MINGW) - list(APPEND sys_libs dxerr8) - else() - list(APPEND sys_libs dxerr) - endif() endif() message(STATUS "Building ${CMAKE_BUILD_TYPE} for ${os}.${cpu}") @@ -655,17 +646,15 @@ elseif (WIN32) set(src_sys_base sys/cpu.cpp sys/threads.cpp + sys/glimp.cpp + sys/events.cpp sys/sys_local.cpp sys/win32/win_cpu.cpp -# sys/win32/win_gamma.cpp - sys/win32/win_glimp.cpp sys/win32/win_input.cpp sys/win32/win_main.cpp sys/win32/win_net.cpp sys/win32/win_shared.cpp sys/win32/win_syscon.cpp - sys/win32/win_taskkeyhook.cpp - sys/win32/win_wndproc.cpp ) set(src_sys_core diff --git a/idlib/precompiled.h b/idlib/precompiled.h index 6dde992..400917a 100644 --- a/idlib/precompiled.h +++ b/idlib/precompiled.h @@ -44,9 +44,6 @@ If you have questions concerning this license or the applicable additional terms #include #include -#define DIRECTINPUT_VERSION 0x0800 // was 0x0700 with the old mssdk -#include - #pragma warning(disable : 4100) // unreferenced formal parameter #pragma warning(disable : 4244) // conversion to smaller type, possible loss of data #pragma warning(disable : 4714) // function marked as __forceinline not inlined