From a259e0d8e4a7975c629a6a468bf79be1b101e87e Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 16 Sep 2010 22:47:33 +0000 Subject: [PATCH] - nothing is easy is windoze (renamed duplicate filename cause VC chokes on it) --- mk/windoze/shared_lib.vcproj | 12 ++++++++---- source/shared_lib/sources/platform/sdl/gl_wrap.cpp | 8 ++++---- .../win32/{gl_wrap.cpp => gl_wrap_billy.cpp} | 0 3 files changed, 12 insertions(+), 8 deletions(-) rename source/shared_lib/sources/platform/win32/{gl_wrap.cpp => gl_wrap_billy.cpp} (100%) diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj index eb16fdf01..b1c219653 100755 --- a/mk/windoze/shared_lib.vcproj +++ b/mk/windoze/shared_lib.vcproj @@ -248,6 +248,10 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > + + @@ -491,10 +495,6 @@ RelativePath="..\..\source\shared_lib\sources\platform\common\cache_manager.cpp" > - - @@ -526,6 +526,10 @@ RelativePath="..\..\source\shared_lib\sources\platform\win32\factory_repository.cpp" > + + diff --git a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp index 30cfb9055..4df38b316 100644 --- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp @@ -141,14 +141,14 @@ void PlatformContextGl::swapBuffers() { } - const char *getPlatformExtensions(const PlatformContextGl *pcgl) { +const char *getPlatformExtensions(const PlatformContextGl *pcgl) { return ""; - } +} - void *getGlProcAddress(const char *procName) { +void *getGlProcAddress(const char *procName) { void* proc = SDL_GL_GetProcAddress(procName); assert(proc!=NULL); return proc; - } +} }}//end namespace diff --git a/source/shared_lib/sources/platform/win32/gl_wrap.cpp b/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp similarity index 100% rename from source/shared_lib/sources/platform/win32/gl_wrap.cpp rename to source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp