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

zzogl-pg: compilation fixex for MSVC builds: 

* resolve a namespace conflict between std::count (due to a 'using namespatce std;' directive)  [debug builds only]
 * switch all MSW-specific code to be unicode compliant so that unicode-only Utilities lib can be used under Windows.  [should work, but needs proper testing]
 * fix some properties sheets so that windows-specific DLL dependencies (common controls and UUID stuff provided by Windows) are linked automatically into wx/utils based plugins.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4140 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-12-25 04:38:44 +00:00
parent 0297a6d364
commit ed7638488c
16 changed files with 108 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/vsprops/wxWidgetsGui.vsprops
View File

@ -12,7 +12,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wxAdv28.lib wxBase28.lib wxCore28.lib zlib.lib libjpeg7.lib"
AdditionalDependencies="wxAdv28.lib wxBase28.lib wxCore28.lib zlib.lib libjpeg7.lib Comctl32.lib rpcrt4.lib"
AdditionalLibraryDirectories="&quot;$(SvnRootDir)\deps\$(PlatformName)\$(ConfigurationName)&quot;"
/>
</VisualStudioPropertySheet>

16
plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
View File

@ -20,7 +20,7 @@
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Devel.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops"
UseOfMFC="0"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
WholeProgramOptimization="0"
@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib winmm.lib dsound.lib comctl32.lib soundtouch.lib x86emitter.lib utilities.lib"
AdditionalDependencies="winmm.lib dsound.lib soundtouch.lib x86emitter.lib utilities.lib"
OutputFile="$(OutDir)\$(ProjectName)-dev.dll"
AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
ModuleDefinitionFile=".\Spu2-X.def"
@ -104,7 +104,7 @@
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Debug.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops"
UseOfMFC="0"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib winmm.lib dsound.lib comctl32.lib soundtouch.lib x86emitter.lib utilities.lib"
AdditionalDependencies="winmm.lib dsound.lib soundtouch.lib x86emitter.lib utilities.lib"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
ModuleDefinitionFile=".\Spu2-X.def"
@ -185,7 +185,7 @@
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Release.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops"
UseOfMFC="0"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
WholeProgramOptimization="1"
@ -233,7 +233,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib winmm.lib dsound.lib comctl32.lib soundtouch.lib x86emitter.lib utilities.lib"
AdditionalDependencies="winmm.lib dsound.lib soundtouch.lib x86emitter.lib utilities.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
@ -271,7 +271,7 @@
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Debug.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops"
UseOfMFC="0"
UseOfATL="1"
UseOfATL="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
@ -318,7 +318,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib winmm.lib dsound.lib comctl32.lib soundtouch.lib x86emitter.lib utilities.lib"
AdditionalDependencies="winmm.lib dsound.lib soundtouch.lib x86emitter.lib utilities.lib"
OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""

29
plugins/zzogl-pg/opengl/GLWin32.cpp
View File

@ -89,7 +89,7 @@ bool GLWindow::CreateWindow(void *pDisplay)
wc.hCursor = LoadCursor(NULL, IDC_ARROW); // Load The Arrow Pointer
wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); // No Background Required For GL
wc.lpszMenuName = NULL; // We Don't Want A Menu
wc.lpszClassName = "PS2EMU_ZEROGS"; // Set The Class Name
wc.lpszClassName = L"PS2EMU_ZEROGS"; // Set The Class Name
RegisterClassEx(&wc);
@ -110,8 +110,8 @@ bool GLWindow::CreateWindow(void *pDisplay)
GetWindowRect(GetDesktopWindow(), &rcdesktop);
GShwnd = CreateWindowEx( dwExStyle, // Extended Style For The Window
"PS2EMU_ZEROGS", // Class Name
"ZZOgl", // Window Title
L"PS2EMU_ZEROGS", // Class Name
L"ZZOgl", // Window Title
dwStyle, // Selected Window Style
(rcdesktop.right - (rc.right - rc.left)) / 2, // Window Position
(rcdesktop.bottom - (rc.bottom - rc.top)) / 2, // Window Position
@ -149,12 +149,12 @@ bool GLWindow::ReleaseContext()
{
if (!wglMakeCurrent(NULL, NULL)) // Are We Able To Release The DC And RC Contexts?
{
MessageBox(NULL, "Release Of DC And RC Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
MessageBox(NULL, L"Release Of DC And RC Failed.", L"SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
}
if (!wglDeleteContext(hRC)) // Are We Able To Delete The RC?
{
MessageBox(NULL, "Release Rendering Context Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
MessageBox(NULL, L"Release Rendering Context Failed.", L"SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
}
hRC = NULL; // Set RC To NULL
@ -162,7 +162,7 @@ bool GLWindow::ReleaseContext()
if (hDC && !ReleaseDC(GShwnd, hDC)) // Are We Able To Release The DC
{
MessageBox(NULL, "Release Device Context Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
MessageBox(NULL, L"Release Device Context Failed.", L"SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
hDC = NULL; // Set DC To NULL
}
@ -234,7 +234,10 @@ bool GLWindow::DisplayWindow(int _width, int _height)
if (ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
{
if (MessageBox(NULL, "The Requested Fullscreen Mode Is Not Supported By\nYour Video Card. Use Windowed Mode Instead?", "NeHe GL", MB_YESNO | MB_ICONEXCLAMATION) == IDYES)
if (MessageBox(NULL,
L"The Requested Fullscreen Mode Is Not Supported By\nYour Video Card. Use Windowed Mode Instead?",
L"NeHe GL",
MB_YESNO | MB_ICONEXCLAMATION) == IDYES)
conf.setFullscreen(false);
else
return false;
@ -271,31 +274,31 @@ bool GLWindow::DisplayWindow(int _width, int _height)
if (!(hDC = GetDC(GShwnd)))
{
MessageBox(NULL, "(1) Can't Create A GL Device Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
MessageBox(NULL, L"(1) Can't Create A GL Device Context.", L"ERROR", MB_OK | MB_ICONEXCLAMATION);
return false;
}
if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd)))
{
MessageBox(NULL, "(2) Can't Find A Suitable PixelFormat.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
MessageBox(NULL, L"(2) Can't Find A Suitable PixelFormat.", L"ERROR", MB_OK | MB_ICONEXCLAMATION);
return false;
}
if (!SetPixelFormat(hDC, PixelFormat, &pfd))
{
MessageBox(NULL, "(3) Can't Set The PixelFormat.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
MessageBox(NULL, L"(3) Can't Set The PixelFormat.", L"ERROR", MB_OK | MB_ICONEXCLAMATION);
return false;
}
if (!(hRC = wglCreateContext(hDC)))
{
MessageBox(NULL, "(4) Can't Create A GL Rendering Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
MessageBox(NULL, L"(4) Can't Create A GL Rendering Context.", L"ERROR", MB_OK | MB_ICONEXCLAMATION);
return false;
}
if (!wglMakeCurrent(hDC, hRC))
{
MessageBox(NULL, "(5) Can't Activate The GL Rendering Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
MessageBox(NULL, L"(5) Can't Activate The GL Rendering Context.", L"ERROR", MB_OK | MB_ICONEXCLAMATION);
return false;
}
@ -316,7 +319,7 @@ void GLWindow::SwapGLBuffers()
void GLWindow::SetTitle(char *strtitle)
{
if (!conf.fullscreen()) SetWindowText(GShwnd, strtitle);
if (!conf.fullscreen()) SetWindowText(GShwnd, wxString::FromUTF8(strtitle));
}
void GLWindow::ResizeCheck()

2
plugins/zzogl-pg/opengl/GSmain.cpp
View File

@ -417,7 +417,7 @@ void CALLBACK GSmakeSnapshot(char *path)
sprintf(strdir, "%s", path);
#ifdef _WIN32
CreateDirectory(strdir, NULL);
CreateDirectory(wxString::FromUTF8(strdir), NULL);
#else
mkdir(path, 0777);
#endif

6
plugins/zzogl-pg/opengl/GifTransfer.cpp
View File

@ -22,7 +22,7 @@
#include "GifTransfer.h"
#ifdef _DEBUG
static int count = 0;
static int path1_count = 0;
#endif
static int nPath3Hack = 0;
@ -241,8 +241,8 @@ void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
//ZZLog::GS_Log("GSgifTransfer1 0x%x (mode %d).", addr, path->mode);
#ifdef _DEBUG
ZZLog::Prim_Log("count: %d\n", count);
count++;
ZZLog::Prim_Log("count: %d\n", path1_count);
path1_count++;
#endif
_GSgifTransfer<0>((u32*)((u8*)pMem + addr), (0x4000 - addr) / 16);

4
plugins/zzogl-pg/opengl/Util.h
View File

@ -26,8 +26,8 @@
#include <io.h>
#include "Utilities/RedtapeWindows.h"
#include <windows.h>
#include <windowsx.h>
//#include <windows.h>
//#include <windowsx.h>
#include <GL/gl.h>
#include <GL/glext.h>

76
plugins/zzogl-pg/opengl/Win32/Conf.cpp
View File

@ -8,31 +8,31 @@ extern HINSTANCE hInst;
void SaveConfig()
{
char szValue[256];
const std::string iniFile(s_strIniPath + "zzogl-pg.ini");
wxChar szValue[256];
const wxString iniFile( wxString::FromUTF8(s_strIniPath.c_str()) + L"zzogl-pg.ini");
sprintf(szValue, "%u", conf.interlace);
WritePrivateProfileString("Settings", "Interlace", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.aa);
WritePrivateProfileString("Settings", "Antialiasing", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.bilinear);
WritePrivateProfileString("Settings", "Bilinear", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.zz_options);
WritePrivateProfileString("Settings", "ZZOptions", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.hacks);
WritePrivateProfileString("Settings", "AdvancedOptions", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.width);
WritePrivateProfileString("Settings", "Width", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.height);
WritePrivateProfileString("Settings", "Height", szValue, iniFile.c_str());
sprintf(szValue, "%u", conf.SkipDraw);
WritePrivateProfileString("Settings", "SkipDraw", szValue, iniFile.c_str());
wxSprintf(szValue, L"%u", conf.interlace);
WritePrivateProfileString(L"Settings", L"Interlace", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.aa);
WritePrivateProfileString(L"Settings", L"Antialiasing", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.bilinear);
WritePrivateProfileString(L"Settings", L"Bilinear", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.zz_options);
WritePrivateProfileString(L"Settings", L"ZZOptions", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.hacks);
WritePrivateProfileString(L"Settings", L"AdvancedOptions", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.width);
WritePrivateProfileString(L"Settings", L"Width", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.height);
WritePrivateProfileString(L"Settings", L"Height", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.SkipDraw);
WritePrivateProfileString(L"Settings", L"SkipDraw", szValue, iniFile);
}
void LoadConfig()
{
char szValue[256];
const std::string iniFile(s_strIniPath + "zzogl-pg.ini");
wxChar szValue[256];
const wxString iniFile( wxString::FromUTF8(s_strIniPath.c_str()) + L"zzogl-pg.ini");
memset(&conf, 0, sizeof(conf));
conf.interlace = 0; // on, mode 1
@ -45,34 +45,34 @@ void LoadConfig()
conf.SkipDraw = 0;
conf.disableHacks = 0;
FILE *fp = fopen(iniFile.c_str(), "rt");
FILE *fp = wxFopen(iniFile, L"rt");
if (!fp)
{
SysMessage("Unable to open ZZOgl-PG's ini file!");
CreateDirectory(s_strIniPath.c_str(), NULL);
CreateDirectory(wxString::FromUTF8(s_strIniPath.c_str()), NULL);
SaveConfig();//save and return
return ;
}
fclose(fp);
GetPrivateProfileString("Settings", "Interlace", NULL, szValue, 20, iniFile.c_str());
conf.interlace = (u8)strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Antialiasing", NULL, szValue, 20, iniFile.c_str());
conf.aa = (u8)strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "ZZOptions", NULL, szValue, 20, iniFile.c_str());
conf.zz_options._u32 = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "AdvancedOptions", NULL, szValue, 20, iniFile.c_str());
conf.hacks._u32 = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Bilinear", NULL, szValue, 20, iniFile.c_str());
conf.bilinear = (u8)strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Width", NULL, szValue, 20, iniFile.c_str());
conf.width = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "Height", NULL, szValue, 20, iniFile.c_str());
conf.height = strtoul(szValue, NULL, 10);
GetPrivateProfileString("Settings", "SkipDraw", NULL, szValue, 20, iniFile.c_str());
conf.SkipDraw = strtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"Interlace", NULL, szValue, 20, iniFile);
conf.interlace = (u8)wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"Antialiasing", NULL, szValue, 20, iniFile);
conf.aa = (u8)wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"ZZOptions", NULL, szValue, 20, iniFile);
conf.zz_options._u32 = wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"AdvancedOptions", NULL, szValue, 20, iniFile);
conf.hacks._u32 = wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"Bilinear", NULL, szValue, 20, iniFile);
conf.bilinear = (u8)wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"Width", NULL, szValue, 20, iniFile);
conf.width = wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"Height", NULL, szValue, 20, iniFile);
conf.height = wxStrtoul(szValue, NULL, 10);
GetPrivateProfileString(L"Settings", L"SkipDraw", NULL, szValue, 20, iniFile);
conf.SkipDraw = wxStrtoul(szValue, NULL, 10);
if (conf.aa < 0 || conf.aa > 4) conf.aa = 0;

11
plugins/zzogl-pg/opengl/Win32/Win32.cpp
View File

@ -1,5 +1,6 @@
#include <stdio.h>
#include <windows.h>
#include "Utilities/RedtapeWindows.h"
#include <windowsx.h>
#include "resrc1.h"
@ -131,7 +132,7 @@ void OnInitConfDialog(HWND hW)
{
if (!(conf.zz_options.loaded)) LoadConfig();
TCHAR *aaName[] = {"None", "x2", "x4", "x8", "x16"};
TCHAR *aaName[] = {L"None", L"x2", L"x4", L"x8", L"x16"};
for(int i=0; i<5; i++)
{
@ -139,7 +140,7 @@ void OnInitConfDialog(HWND hW)
}
ComboBox_SelectString(GetDlgItem(hW, IDC_AA_COMBO), -1, (LPARAM)aaName[conf.aa]);
TCHAR *sizeName[] = {"640 x 480", "800 x 600", "1024 x 768", "1280 x 960"};
TCHAR *sizeName[] = {L"640 x 480", L"800 x 600", L"1024 x 768", L"1280 x 960"};
for(int i=0; i<4; i++)
{
@ -285,7 +286,7 @@ static int errval;
void *SysLoadLibrary(char *lib)
{
return LoadLibrary(lib);
return LoadLibrary(wxString::FromUTF8(lib));
}
void *SysLoadSym(void *lib, char *sym)
@ -320,5 +321,5 @@ void SysMessage(const char *fmt, ...)
va_start(list, fmt);
vsprintf(tmp, fmt, list);
va_end(list);
MessageBox(0, tmp, "ZZOgl-PG Msg", 0);
MessageBox(0, wxString::FromUTF8(tmp), L"ZZOgl-PG Msg", 0);
}

16
plugins/zzogl-pg/opengl/Win32/aviUtil.h
View File

@ -17,7 +17,7 @@ BOOL AVI_Init()
if (wVer < 0x010a){
/* oops, we are too old, blow out of here */
//MessageBeep(MB_ICONHAND);
MessageBox(NULL, "Cant't init AVI File - Video for Windows version is to old", "Error", MB_OK|MB_ICONSTOP);
MessageBox(NULL, L"Cant't init AVI File - Video for Windows version is to old", L"Error", MB_OK|MB_ICONSTOP);
return FALSE;
}
@ -29,7 +29,7 @@ BOOL AVI_Init()
BOOL AVI_FileOpenWrite(PAVIFILE * pfile, const char *filename)
{
HRESULT hr = AVIFileOpen(pfile, // returned file pointer
filename, // file name
wxString::FromUTF8(filename), // file name
OF_WRITE | OF_CREATE, // mode to open file with
NULL); // use handler determined
// from file extension....
@ -272,9 +272,9 @@ BOOL AVI_AddFrame(PAVISTREAM psCompressed, int time, LPBITMAPINFOHEADER lpbi)
NULL);
if (hr != AVIERR_OK)
{
char strMsg[255];
_snprintf(strMsg, 255, "Error: AVIStreamWrite, error %d",hr);
MessageBox(NULL, strMsg, "", MB_OK);
TCHAR strMsg[255];
_snwprintf(strMsg, 255, L"Error: AVIStreamWrite, error %d",hr);
MessageBox(NULL, strMsg, L"", MB_OK);
return FALSE;
}
@ -410,9 +410,9 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
NULL);
if (hr != AVIERR_OK)
{
char strMsg[255];
_snprintf(strMsg, 255, "Error: AVIStreamWrite, error %d",hr);
MessageBox(NULL, strMsg, "", MB_OK);
TCHAR strMsg[255];
_snwprintf(strMsg, 255, L"Error: AVIStreamWrite, error %d",hr);
MessageBox(NULL, strMsg, L"", MB_OK);
return FALSE;
}

36
plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
View File

@ -18,10 +18,10 @@
<Configuration
Name="Devel|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Devel.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Devel.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@ -91,8 +91,8 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Debug.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops"
CharacterSet="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Debug.vsprops;..\..\..\..\common\vsprops\IncrementalLinking.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@ -112,7 +112,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)\&quot;;&quot;$(ProjectRootDir)\ZeroGSShaders\&quot;;&quot;$(ProjectRootDir)\Win32&quot;;&quot;$(SvnRootDir)\3rdparty\libjpeg&quot;"
PreprocessorDefinitions="_USRDLL;ZEROGS_DEVBUILD;_DEBUG;__i386__"
PreprocessorDefinitions="wxUSE_GUI=0;_USRDLL;ZEROGS_DEVBUILD;_DEBUG;__i386__"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -156,10 +156,10 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Release.vsprops"
InheritedPropertySheets="..\..\..\..\common\vsprops\plugin_svnroot.vsprops;..\..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\..\common\vsprops\CodeGen_Release.vsprops;..\..\..\..\common\vsprops\pthreads.vsprops;..\..\..\..\common\vsprops\wxWidgetsGui.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
@ -356,16 +356,12 @@
RelativePath="..\ZZClut.cpp"
>
</File>
<File
RelativePath="..\ZZKeyboard.cpp"
>
</File>
<File
RelativePath="..\ZZHacks.cpp"
>
</File>
<File
RelativePath="..\ZZoglDrawing.cpp"
RelativePath="..\ZZKeyboard.cpp"
>
</File>
<File
@ -380,6 +376,10 @@
RelativePath="..\ZZoglCRTC.cpp"
>
</File>
<File
RelativePath="..\ZZoglDrawing.cpp"
>
</File>
<File
RelativePath="..\ZZoglFlush.cpp"
>
@ -513,10 +513,6 @@
RelativePath="..\ZZHacks.h"
>
</File>
<File
RelativePath="..\ZZoglDrawing.h"
>
</File>
<File
RelativePath="..\ZZLog.h"
>
@ -525,6 +521,10 @@
RelativePath="..\ZZoglCRTC.h"
>
</File>
<File
RelativePath="..\ZZoglDrawing.h"
>
</File>
<File
RelativePath="..\ZZoglFlushHack.h"
>
@ -572,11 +572,11 @@
</File>
</Filter>
<File
RelativePath=".\ps2hw.dat"
RelativePath="..\ps2hw.dat"
>
</File>
<File
RelativePath="..\ps2hw.dat"
RelativePath=".\ps2hw.dat"
>
</File>
</Files>

3
plugins/zzogl-pg/opengl/ZZGl.h
View File

@ -26,7 +26,8 @@
// Need this before gl.h
#ifdef _WIN32
#include <windows.h>
#include "Utilities/RedtapeWindows.h"
#include <GL/gl.h>
#include <GL/glext.h>
#include "glprocs.h"

2
plugins/zzogl-pg/opengl/ZZoglCRTC.cpp
View File

@ -144,7 +144,7 @@ inline void FrameSavingHelper()
#ifdef _WIN32
else
{
DeleteFile("frame2.tga");
DeleteFile(L"frame2.tga");
}
#endif
}

2
plugins/zzogl-pg/opengl/ZZoglShoots.cpp
View File

@ -22,7 +22,7 @@
//------------------ Includes
#include "Util.h"
#if defined(_WIN32)
# include <windows.h>
# include "Utilities/RedtapeWindows.h"
# include <aviUtil.h>
# include "resource.h"
#endif

2
plugins/zzogl-pg/opengl/glprocs.c
View File

@ -42,7 +42,7 @@
#include <stdlib.h>
#ifdef _WIN32
#include <windows.h>
#include "Utilities/RedtapeWindows.h"
#include <GL/gl.h>//"gl.h" /* Include local "gl.h". Don't include vc32 <GL/gl.h>. */
#include "glprocs.h"
#else /* GLX */

2
plugins/zzogl-pg/opengl/rasterfont.cpp
View File

@ -18,7 +18,7 @@
*/
#ifdef _WIN32
#include <windows.h>
#include "Utilities/RedtapeWindows.h"
#endif
#include <GL/gl.h>

2
plugins/zzogl-pg/opengl/zerogs.h
View File

@ -32,7 +32,7 @@
// State parameters
#if defined(_WIN32)
# include <windows.h>
# include "Utilities/RedtapeWindows.h"
# include "resource.h"
#endif