Added GDI+ setup as I plan to rewrite the viewers soon (they'll use GDI+).
But, we do keep DirectDraw for the main window!
This commit is contained in:
parent
a0cade405f
commit
a2548e687b
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="shift_jis"?>
|
<?xml version="1.0" encoding="shift_jis"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9.00"
|
Version="9,00"
|
||||||
Name="DeSmuME_VS2008"
|
Name="DeSmuME_VS2008"
|
||||||
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
||||||
RootNamespace="DeSmuME"
|
RootNamespace="DeSmuME"
|
||||||
|
@ -161,7 +161,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
|
AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib gdiplus.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
|
||||||
OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
|
OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
|
||||||
AdditionalLibraryDirectories=".\zlib123;.\zziplib"
|
AdditionalLibraryDirectories=".\zlib123;.\zziplib"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
|
|
|
@ -79,6 +79,10 @@
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
#include <GdiPlus.h>
|
||||||
|
|
||||||
|
using namespace Gdiplus;
|
||||||
|
|
||||||
//----Recent ROMs menu globals----------
|
//----Recent ROMs menu globals----------
|
||||||
vector<string> RecentRoms; //The list of recent ROM filenames
|
vector<string> RecentRoms; //The list of recent ROM filenames
|
||||||
const unsigned int MAX_RECENT_ROMS = 10; //To change the recent rom max, simply change this number
|
const unsigned int MAX_RECENT_ROMS = 10; //To change the recent rom max, simply change this number
|
||||||
|
@ -1302,6 +1306,17 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
|
||||||
int nFunsterStil)
|
int nFunsterStil)
|
||||||
|
|
||||||
{
|
{
|
||||||
|
ULONG_PTR GdiplusToken;
|
||||||
|
GdiplusStartupInput GdiplusSI;
|
||||||
|
|
||||||
|
GdiplusSI.GdiplusVersion = 1;
|
||||||
|
|
||||||
|
if(GdiplusStartup(&GdiplusToken, &GdiplusSI, NULL) != Ok)
|
||||||
|
{
|
||||||
|
MessageBox(0, "Failed to initialize GDI+ !", "Severe error", MB_OK | MB_ICONERROR);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
InitializeCriticalSection(&win_sync);
|
InitializeCriticalSection(&win_sync);
|
||||||
|
|
||||||
#ifdef GDB_STUB
|
#ifdef GDB_STUB
|
||||||
|
@ -1635,6 +1650,8 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
|
||||||
|
|
||||||
CloseConsole();
|
CloseConsole();
|
||||||
|
|
||||||
|
GdiplusShutdown(GdiplusToken);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue