From f4e7a280a9cc968f9a20ef2f027ed3b3753d6940 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:07:43 -0600 Subject: [PATCH] Remove cg.lib from some files for Windows and renaming a function. --- Source/Core/DolphinWX/Src/GLInterface/AGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.h | 2 +- .../Core/DolphinWX/Src/GLInterface/InterfaceBase.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.h | 2 +- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 14 +++++++------- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 2 +- Source/VSProps/Dolphin.Win32.props | 4 ++-- Source/VSProps/Dolphin.x64.props | 4 ++-- 15 files changed, 23 insertions(+), 23 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(); diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 18b8ac4d84..aa7f697772 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -121,7 +121,7 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -133,7 +133,7 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -147,7 +147,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -161,7 +161,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -175,7 +175,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -189,7 +189,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -247,4 +247,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index f52ec917e2..e57e3e210a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -166,7 +166,7 @@ bool VideoBackend::Initialize(void *&window_handle) UpdateActiveConfig(); InitInterface(); - if (!GLInterface->CreateWindow(window_handle)) + if (!GLInterface->Create(window_handle)) return false; s_BackendInitialized = true; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 1c18b1c165..11f7f39b5c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -73,7 +73,7 @@ bool VideoSoftware::Initialize(void *&window_handle) g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); InitInterface(); - if (!GLInterface->CreateWindow(window_handle)) + if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); return false; diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 5adc4159e0..1cddeea4e5 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -8,8 +8,8 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) - \ No newline at end of file + diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props index 557e6350e7..c6f3410026 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -9,8 +9,8 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) - \ No newline at end of file +