ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some quick fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1252 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-24 04:34:23 +00:00
parent 08d3360376
commit 7519fb8113
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/include/Pcsx2Defs.h
View File

@ -51,11 +51,11 @@
# endif # endif
# else # else
# ifdef _MSC_VER # ifdef _MSC_VER
# define jBREAKPOINT() do { __asm int 3 } while(0) # define jBREAKPOINT() do { __asm int 3 } while(0);
# else # else
# define jBREAKPOINT() ((void) *(volatile char *) 0) # define jBREAKPOINT() ((void) *(volatile char *) 0)
# endif # endif
# define jASSUME(exp) do { if(exp) ; else jBREAKPOINT() } while(0) # define jASSUME(exp) do { if(exp) ; else jBREAKPOINT() } while(0);
# endif # endif
#endif #endif
@ -71,8 +71,8 @@
// //
#ifndef jNO_DEFAULT #ifndef jNO_DEFAULT
#define jNO_DEFAULT \ #define jNO_DEFAULT \
{ \
default: \ default: \
{ \
jASSUME(0); \ jASSUME(0); \
break; \ break; \
} }

23
plugins/zerogs/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -17,8 +17,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Devel|Win32" Name="Devel|Win32"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
@ -102,11 +102,14 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
@ -175,11 +178,14 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\vsprops\pcsx2_plugin_common.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
@ -265,6 +271,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
@ -278,6 +287,14 @@
RelativePath=".\Conf.cpp" RelativePath=".\Conf.cpp"
> >
</File> </File>
<File
RelativePath="..\GifTransfer.cpp"
>
</File>
<File
RelativePath="..\GifTransfer.h"
>
</File>
<File <File
RelativePath="..\glprocs.c" RelativePath="..\glprocs.c"
> >