summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2012-12-26 00:07:43 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2012-12-26 00:07:43 -0600
commitf4e7a280a9cc968f9a20ef2f027ed3b3753d6940 (patch)
treed16fffe0cc685f02f230859b3dcbb98e359829d7 /Source/Core
parente9099459bb6d2e66eefb6686c2fee2a03bf19fd5 (diff)
Remove cg.lib from some files for Windows and renaming a function.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/AGL.h2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/EGL.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/EGL.h2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/GLX.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/GLX.h2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/WGL.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/WGL.h2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/WX.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/WX.h2
10 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
index 1e73f3c6b8..e6e4f9be27 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
@@ -29,7 +29,7 @@ class cInterfaceAGL : public cInterfaceBase
public:
void SwapBuffers();
void UpdateFPSDisplay(const char *Text);
- bool CreateWindow(void *&window_handle);
+ bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();
};
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
index 00d16ba504..155f59b093 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
@@ -225,7 +225,7 @@ void cInterfaceEGL::SwapBuffers()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceEGL::CreateWindow(void *&window_handle)
+bool cInterfaceEGL::Create(void *&window_handle)
{
int _tx, _ty, _twidth, _theight;
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
index afb57b2ac2..e3b4ec40e8 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
@@ -35,7 +35,7 @@ private:
public:
void SwapBuffers();
void UpdateFPSDisplay(const char *Text);
- bool CreateWindow(void *&window_handle);
+ bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();
};
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
index cbe749845e..235e393040 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
@@ -225,7 +225,7 @@ void cInterfaceGLX::SwapBuffers()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceGLX::CreateWindow(void *&window_handle)
+bool cInterfaceGLX::Create(void *&window_handle)
{
int _tx, _ty, _twidth, _theight;
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
index bea58cb862..9b6a3cb87d 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
@@ -33,7 +33,7 @@ private:
public:
void SwapBuffers();
void UpdateFPSDisplay(const char *Text);
- bool CreateWindow(void *&window_handle);
+ bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();
};
diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
index 0c1c438cd0..dfe534c41a 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
@@ -25,7 +25,7 @@ protected:
public:
virtual void SwapBuffers() = 0;
virtual void UpdateFPSDisplay(const char *Text) = 0;
- virtual bool CreateWindow(void *&window_handle) = 0;
+ virtual bool Create(void *&window_handle) = 0;
virtual bool MakeCurrent() = 0;
virtual void Shutdown() = 0;
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
index 99f861e019..70f86a3ddf 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
@@ -57,7 +57,7 @@ void cInterfaceWGL::UpdateFPSDisplay(const char *text)
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceWGL::CreateWindow(void *&window_handle)
+bool cInterfaceWGL::Create(void *&window_handle)
{
int _tx, _ty, _twidth, _theight;
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
index 4ef6943623..e45d538a78 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
@@ -30,7 +30,7 @@ class cInterfaceWGL : public cInterfaceBase
public:
void SwapBuffers();
void UpdateFPSDisplay(const char *Text);
- bool CreateWindow(void *&window_handle);
+ bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
index 460d9357cb..36e3e60fa5 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
@@ -35,7 +35,7 @@ void cInterfaceWX::UpdateFPSDisplay(const char *text)
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceWX::CreateWindow(void *&window_handle)
+bool cInterfaceWX::Create(void *&window_handle)
{
int _tx, _ty, _twidth, _theight;
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h
index d15044e503..8f4af1c8d6 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WX.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h
@@ -37,7 +37,7 @@ class cInterfaceWX : public cInterfaceBase
public:
void SwapBuffers();
void UpdateFPSDisplay(const char *Text);
- bool CreateWindow(void *&window_handle);
+ bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();