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

Potential fix for full screen GL in Windows, and fixes for both Linux and Mac

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@102 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-07-30 06:10:34 +00:00
parent 3e479c7c8f
commit f95619e509
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Src/CPUDetect.cpp
View File

@ -17,14 +17,12 @@
#ifdef _WIN32
#include <intrin.h>
#endif
#else
#ifdef __linux__
//#include <config/i386/cpuid.h>
#include <xmmintrin.h>
void __cpuid(int info[4], int x) {}
#endif
#include <memory.h>

2
Source/Core/Common/Src/Thread.h
View File

@ -20,6 +20,8 @@
#ifdef _WIN32
#include <windows.h>
#else
#include <pthread.h>
#endif
#ifdef _WIN32

6
Source/Core/DiscIO/Src/VolumeCreator.cpp
View File

@ -37,7 +37,7 @@ enum EDiscType
DISC_TYPE_WII_CONTAINER,
DISC_TYPE_GC
};
#ifndef WIN32
#ifndef _WIN32
struct SPartition
{
u64 Offset;
@ -156,7 +156,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, int _VolumeType)
u32 numPartitions = Reader.Read32(0x40000);
u64 PartitionsOffset = (u64)Reader.Read32(0x40004) << 2;
#ifdef WIN32
#ifdef _WIN32
struct SPartition
{
u64 Offset;
@ -164,7 +164,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, int _VolumeType)
};
#endif
std::vector<SPartition>PartitionsVec;
// read all partitions
for (u32 i = 0; i < numPartitions; i++)
{

4
Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
View File

@ -160,8 +160,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GetWindowRect(GetDesktopWindow(), &rcdesktop);
if (g_Config.bFullscreen) {
nBackbufferWidth = rcdesktop.right - rcdesktop.left;
nBackbufferHeight = rcdesktop.bottom - rcdesktop.top;
//nBackbufferWidth = rcdesktop.right - rcdesktop.left;
//nBackbufferHeight = rcdesktop.bottom - rcdesktop.top;
DEVMODE dmScreenSettings;
memset(&dmScreenSettings,0,sizeof(dmScreenSettings));