The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed windows and linux builds. the console/debugger/etc files in lle/hle/ogl really need to be de-uglified!

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@833 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2008-10-11 02:29:57 +00:00
parent 540539ee27
commit 3d1cc88b4f
4 changed files with 209 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
View File

@ -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"

5
Source/Plugins/Plugin_VideoOGL/Src/Logging/Console.cpp
View File

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

3
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -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"

12
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
View File

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