From 3d1cc88b4f5e4d2fd607fdbea5a25b034a20db64 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 11 Oct 2008 02:29:57 +0000 Subject: [PATCH] fixed windows and linux builds. the console/debugger/etc files in lle/hle/ogl really need to be de-uglified! git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@833 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugin_VideoOGL/Plugin_VideoOGL.vcproj | 202 +++++++++++++++++- .../Plugin_VideoOGL/Src/Logging/Console.cpp | 5 +- .../Plugin_VideoOGL/Src/TextureMngr.cpp | 3 +- .../Src/VertexShaderManager.cpp | 12 +- 4 files changed, 209 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj index 16f714e3b7..3eb405d4c0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj @@ -67,7 +67,7 @@ FloatingPointModel="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="Globals.h" - PrecompiledHeaderFile="$(IntDir)/Globals.pch" + PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch" AssemblerListingLocation="$(IntDir)\" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" @@ -76,7 +76,7 @@ SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" - ForcedIncludeFiles="" + ForcedIncludeFiles="stdafx.h" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #include #ifdef _WIN32 #include #endif -#include "../Globals.h" // -------------------- @@ -149,12 +149,15 @@ void ClearScreen() #endif } +#ifndef _WIN32 +// VERY UGLY! needs to be fixed soon, just fixing the biuld... void CloseConsole() { } void OpenConsole() { } +#endif #if defined(DEBUGG) && defined(_WIN32) HWND GetConsoleHwnd(void) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp index c763576ab8..28a05410a2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp @@ -15,6 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include "Globals.h" + #ifdef _WIN32 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set #define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset @@ -27,7 +29,6 @@ #undef _interlockedbittestandreset64 #endif -#include "Globals.h" #include "Profiler.h" #include "Render.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp index 80cd6c6787..40c049ae67 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp @@ -362,8 +362,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs) wAdj = ratio; hAdj = 1; - wid = ceil(abs(2 * rawViewport[0]) / wAdj); - hei = ceil(abs(2 * rawViewport[1]) / hAdj); + wid = ceil(fabs(2 * rawViewport[0]) / wAdj); + hei = ceil(fabs(2 * rawViewport[1]) / hAdj); actualWid = ceil((float)winw / ratio); actualRatiow = (float)actualWid / (float)wid; // the picture versus the screen @@ -377,8 +377,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs) wAdj = 1; hAdj = ratio; - wid = ceil(abs(2 * rawViewport[0]) / wAdj); - hei = ceil(abs(2 * rawViewport[1]) / hAdj); + wid = ceil(fabs(2 * rawViewport[0]) / wAdj); + hei = ceil(fabs(2 * rawViewport[1]) / hAdj); actualHei = ceil((float)winh / ratio); actualRatioh = (float)actualHei / (float)hei; // the picture versus the screen @@ -388,8 +388,8 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs) } else { - wid = ceil(abs(2 * rawViewport[0])); - hei = ceil(abs(2 * rawViewport[1])); + wid = ceil(fabs(2 * rawViewport[0])); + hei = ceil(fabs(2 * rawViewport[1])); } if(g_Config.bStretchToFit)