From 6332ae522f34b2811b62b83e9a44545f0c72cba3 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Sun, 10 Jun 2007 21:54:35 +0200 Subject: [PATCH] * ifdef most of VideoUpdate away to make it compile. --- ABM2/Engine/VideoUpdate.cpp | 3 ++- ABM2/Makefile | 2 +- ABM2/main.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ABM2/Engine/VideoUpdate.cpp b/ABM2/Engine/VideoUpdate.cpp index 9ff6db9..14f6044 100755 --- a/ABM2/Engine/VideoUpdate.cpp +++ b/ABM2/Engine/VideoUpdate.cpp @@ -15,7 +15,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// LPDIRECT3DDEVICE9 d3ddev; // the pointer to the device class - +#endif //WIN32 CMMPointer > CVideoUpdate::screenWidth=0; CMMPointer > CVideoUpdate::screenHeight=0; CMMPointer > CVideoUpdate::screenBPP=0; @@ -23,6 +23,7 @@ int CVideoUpdate::scrWidth=640; int CVideoUpdate::scrHeight=480; int CVideoUpdate::scrBPP=16; +#ifdef WIN32 CVideoUpdate::CVideoUpdate() { d3d = Direct3DCreate9(D3D_SDK_VERSION); diff --git a/ABM2/Makefile b/ABM2/Makefile index 216421b..b3857a6 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 +OBJS:=main.o Engine/Log.o SchemeReader.o Engine/Settings.o Engine/mmanager.o Engine/Kernel.o Engine/ProfileLogHandler.o Engine/VideoUpdate.o all: $(OBJS) diff --git a/ABM2/main.h b/ABM2/main.h index 6ca3351..f027fb8 100755 --- a/ABM2/main.h +++ b/ABM2/main.h @@ -1,4 +1,6 @@ #pragma once +#ifdef WIN32 extern HINSTANCE hInstance; extern HWND hWnd; +#endif //WIN32 -- 2.30.2