From: Matthijs Kooijman Date: Mon, 11 Jun 2007 05:56:49 +0000 (+0200) Subject: * Add SoundTask to makefile (no modifications required). X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2FABM2.git;a=commitdiff_plain;h=6b7cd5e1f9f9d3bba924c61bb8567c996e10da41 * Add SoundTask to makefile (no modifications required). --- diff --git a/ABM2/Engine/InputTask.cpp b/ABM2/Engine/InputTask.cpp index 82d513e..5fd261d 100755 --- a/ABM2/Engine/InputTask.cpp +++ b/ABM2/Engine/InputTask.cpp @@ -5,11 +5,13 @@ #include "InputTask.h" #include "../main.h" +#ifdef WIN32 // include the DirectX Library files #pragma comment (lib, "dinput.lib") #pragma comment (lib, "dinput8.lib") #pragma comment (lib, "dxguid.lib") +#endif WIN32 ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -25,6 +27,7 @@ int CInputTask::dY=0; unsigned int CInputTask::buttons=0; unsigned int CInputTask::oldButtons=0; +#ifdef WIN32 CInputTask::CInputTask() { din = NULL; @@ -88,3 +91,4 @@ void CInputTask::Stop() memset(keys, 0, 256); memset(oldKeys, 0, 256); } +#endif // WIN32 diff --git a/ABM2/Makefile b/ABM2/Makefile index 89718c5..a3e7a9b 100644 --- a/ABM2/Makefile +++ b/ABM2/Makefile @@ -1,5 +1,5 @@ CFLAGS:=-I. -OBJS:=main.o Engine/Log.o SchemeReader.o Engine/Settings.o Engine/mmanager.o Engine/Kernel.o Engine/ProfileLogHandler.o Engine/VideoUpdate.o Engine/GlobalTimer.o +OBJS:=main.o Engine/Log.o SchemeReader.o Engine/Settings.o Engine/mmanager.o Engine/Kernel.o Engine/ProfileLogHandler.o Engine/VideoUpdate.o Engine/GlobalTimer.o Engine/SoundTask.o all: $(OBJS)