summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-02-11 15:06:40 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2013-02-12 14:11:29 -0600
commit818a376bd4f13a8913c4d8726e2e5a6701beeee8 (patch)
tree7e6d758af8d8261a618454b7d8eb9be516d54a98
parente53d88da2dc7896c27db8a90082749c60c9d89ae (diff)
Fix header guard and definitions not being set to 1
-rw-r--r--CMakeLists.txt6
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/EGL.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dc02e80d5..45b62037d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,14 +239,14 @@ endif()
# Enabling GLES also disables the OpenGL plugin.
if(USE_GLES)
message("GLES rendering enabled")
- add_definitions(-DUSE_GLES)
- add_definitions(-DUSE_EGL)
+ add_definitions(-DUSE_GLES=1)
+ add_definitions(-DUSE_EGL=1)
set(USE_EGL True)
endif()
if(USE_EGL)
message("EGL OpenGL interface enabled")
- add_definitions(-DUSE_EGL)
+ add_definitions(-DUSE_EGL=1)
endif()
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
index c4b6a00b6c..ad05ca3e5d 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
@@ -14,8 +14,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
-#ifndef _INTERFACEGLX_H_
-#define _INTERFACEGLX_H_
+#ifndef _INTERFACEEGL_H_
+#define _INTERFACEEGL_H_
#include <EGL/egl.h>
#ifdef USE_GLES