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

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"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -276,7 +276,7 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="Globals.h"

-				PrecompiledHeaderFile="$(IntDir)/Globals.pch"

+				PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch"

 				AssemblerListingLocation="$(IntDir)\"

 				ObjectFile="$(IntDir)\"

 				ProgramDataBaseFileName="$(IntDir)\"

@@ -484,7 +484,7 @@
 				FloatingPointModel="2"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="Globals.h"

-				PrecompiledHeaderFile="$(IntDir)/Globals.pch"

+				PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch"

 				AssemblerListingLocation="$(IntDir)\"

 				ObjectFile="$(IntDir)\"

 				ProgramDataBaseFileName="$(IntDir)\"

@@ -493,7 +493,7 @@
 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

 				CompileAs="0"

-				ForcedIncludeFiles=""

+				ForcedIncludeFiles="stdafx.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -903,6 +903,54 @@
 			<File

 				RelativePath=".\Src\Debugger\Debugger.cpp"

 				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\Src\Debugger\Debugger.h"

@@ -911,6 +959,54 @@
 			<File

 				RelativePath=".\Src\Debugger\PBView.cpp"

 				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\Src\Debugger\PBView.h"

@@ -923,6 +1019,54 @@
 			<File

 				RelativePath=".\Src\Logging\Console.cpp"

 				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\Src\Logging\Console.h"

@@ -931,6 +1075,54 @@
 			<File

 				RelativePath=".\Src\Logging\Logging.cpp"

 				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="DebugFast|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PrecompiledHeaderThrough="../Globals.h"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\Src\Logging\Logging.h"

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp
index 95a4777dfe..971884a7a2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp
@@ -18,12 +18,12 @@
 

 // --------------------

 // Includes

+#include "../Globals.h"

 #include <string>

 #include <stdio.h>

 #ifdef _WIN32

 #include <windows.h>

 #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)