diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-30 06:10:34 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-07-30 06:10:34 +0000 |
| commit | f95619e509a4050d83ea0e670cbc4cafc3ee2a58 (patch) | |
| tree | 525dc2187212fe7caddc7e74c28b95d01c5ba0f7 /Source/Core | |
| parent | 3e479c7c8fa91d031884cf95169991354ca48a11 (diff) | |
Potential fix for full screen GL in Windows, and fixes for both Linux and Mac
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@102 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/CPUDetect.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Thread.h | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/VolumeCreator.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 41f03be964..a8171fefab 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -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>
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index 63e9aa10d4..af084c6b4b 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -20,6 +20,8 @@ #ifdef _WIN32
#include <windows.h>
+#else
+#include <pthread.h>
#endif
#ifdef _WIN32
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp index 8a22a215fe..8320182467 100644 --- a/Source/Core/DiscIO/Src/VolumeCreator.cpp +++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp @@ -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++)
{
|