From 288eb3c1b2ecead3772e3879b76544de5f0a5412 Mon Sep 17 00:00:00 2001 From: Bim Overbohm Date: Tue, 14 May 2013 22:07:19 +0200 Subject: [PATCH] Update platform file to fit to CMakeLists The #defines "USE_OPENGL_ES" and "USE_OPENGL_DESKTOP" to control GLES vs. Desktop OpenGL usage. The #define _RPI_ is used solely on Raspberry Pi now. --- .../EmulationStation_vs2010.vcxproj | 1 + src/platform.h | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj b/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj index 9fc758f21..d29e27a3d 100644 --- a/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj +++ b/EmulationStation_vs2010/EmulationStation_vs2010/EmulationStation_vs2010.vcxproj @@ -54,6 +54,7 @@ MaxSpeed true true + USE_OPENGL_DESKTOP;%(PreprocessorDefinitions) true diff --git a/src/platform.h b/src/platform.h index f3b88de12..011d7b81a 100644 --- a/src/platform.h +++ b/src/platform.h @@ -1,15 +1,14 @@ //the Makefiles define these via command line -//#define _RPI_ -//#define _DESKTOP_ +//#define USE_OPENGL_ES +//#define USE_OPENGL_DESKTOP -#ifdef _RPI_ +#ifdef USE_OPENGL_ES #define GLHEADER #endif - -#ifdef _DESKTOP_ +#ifdef USE_OPENGL_DESKTOP //why the hell this naming inconsistency exists is well beyond me - #ifdef _WIN32 + #ifdef WIN32 #define sleep Sleep #endif