peopsxgl: Readded windows support.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56180 e17a0e51-4ae3-4d35-97c3-1a29b211df97

6 files changed, 398 insertions, 21 deletions

diff --git a/win32/plugins/dfxvideo/winsrc/DFXVideo.def b/win32/plugins/dfxvideo/DFXVideo.def
index dc7d8c9b..dc7d8c9b 100644
--- a/win32/plugins/dfxvideo/winsrc/DFXVideo.def
+++ b/win32/plugins/dfxvideo/DFXVideo.def
diff --git a/win32/plugins/dfxvideo/DFXVideo.dev b/win32/plugins/dfxvideo/DFXVideo.dev
new file mode 100644
index 00000000..73a6369e
--- /dev/null
+++ b/win32/plugins/dfxvideo/DFXVideo.dev
@@ -0,0 +1,379 @@
+[Project]

+FileName=DFXVideo.dev

+Name=DFXVideo

+Ver=1

+IsCpp=1

+Type=3

+Compiler=-W -DWIN32 -DNDEBUG -D_WINDOWS -D__i386___@@_

+CppCompiler=-W -DWIN32 -DNDEBUG -D_WINDOWS -D__i386___@@_

+Includes=.\\;.\winsrc;..\..;..\..\glue;..\..\..\libpcsxcore;..\..\..\plugins\dfxvideo

+Linker=-luser32 -lgdi32 -lwinmm -ladvapi32 -lvfw32 -def DFXVideo.def --enable-stdcall-fixup_@@_

+Libs=

+UnitCount=33

+Folders=dfxvideo,winsrc,winsrc/directx

+ObjFiles=

+PrivateResource=DFXVideo_private.rc

+ResourceIncludes=

+MakeIncludes=

+Icon=

+ExeOutput=

+ObjectOutput=

+OverrideOutput=0

+OverrideOutputName=DFXVideo.exe

+HostApplication=

+CommandLine=

+UseCustomMakefile=0

+CustomMakefile=

+IncludeVersionInfo=0

+SupportXPThemes=0

+CompilerSet=0

+CompilerSettings=0010000001001000000100

+

+[Unit1]

+FileName=winsrc\d3d.h

+Folder=winsrc/directx

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit2]

+FileName=winsrc\d3dcaps.h

+Folder=winsrc/directx

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit3]

+FileName=winsrc\d3dtypes.h

+Folder=winsrc/directx

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit4]

+FileName=winsrc\ddraw.h

+Folder=winsrc/directx

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit5]

+FileName=winsrc\dxguid.c

+Folder=winsrc/directx

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit6]

+FileName=winsrc\cfg.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit7]

+FileName=winsrc\draw.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit8]

+FileName=winsrc\fps.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit9]

+FileName=winsrc\key.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit10]

+FileName=winsrc\record.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit11]

+FileName=winsrc\record.h

+Folder=winsrc

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit12]

+FileName=winsrc\winmain.c

+Folder=winsrc

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit13]

+FileName=..\..\..\plugins\dfxvideo\cfg.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit14]

+FileName=..\..\..\plugins\dfxvideo\draw.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit15]

+FileName=..\..\..\plugins\dfxvideo\externals.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit16]

+FileName=..\..\..\plugins\dfxvideo\fps.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit17]

+FileName=..\..\..\plugins\dfxvideo\gpu.c

+Folder=dfxvideo

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit18]

+FileName=..\..\..\plugins\dfxvideo\gpu.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit19]

+FileName=..\..\..\plugins\dfxvideo\hq2x.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit20]

+FileName=..\..\..\plugins\dfxvideo\hq3x.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit21]

+FileName=..\..\..\plugins\dfxvideo\interp.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit22]

+FileName=..\..\..\plugins\dfxvideo\key.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit23]

+FileName=..\..\..\plugins\dfxvideo\menu.c

+Folder=dfxvideo

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit24]

+FileName=..\..\..\plugins\dfxvideo\menu.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit25]

+FileName=..\..\..\plugins\dfxvideo\prim.c

+Folder=dfxvideo

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit26]

+FileName=..\..\..\plugins\dfxvideo\prim.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit27]

+FileName=..\..\..\plugins\dfxvideo\soft.c

+Folder=dfxvideo

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit28]

+FileName=..\..\..\plugins\dfxvideo\soft.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit29]

+FileName=..\..\..\plugins\dfxvideo\swap.h

+Folder=dfxvideo

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit30]

+FileName=..\..\..\plugins\dfxvideo\zn.c

+Folder=dfxvideo

+Compile=1

+CompileCpp=0

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit31]

+FileName=DFXVideo.def

+Folder=

+Compile=0

+CompileCpp=0

+Link=0

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit32]

+FileName=DFXVideo.rc

+Folder=Resources

+Compile=1

+CompileCpp=1

+Link=0

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit33]

+FileName=resource.h

+Folder=

+Compile=1

+CompileCpp=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[VersionInfo]

+Major=0

+Minor=1

+Release=1

+Build=1

+LanguageID=1033

+CharsetID=1252

+CompanyName=

+FileVersion=0.1

+FileDescription=Developed using the Dev-C++ IDE

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=DFXVideo.exe

+ProductName=DFXVideo

+ProductVersion=0.1

+AutoIncBuildNr=0

+

diff --git a/win32/plugins/dfxvideo/DFXVideo.dsp b/win32/plugins/dfxvideo/DFXVideo.dsp
index 508944b8..3d2e5eaf 100644
--- a/win32/plugins/dfxvideo/DFXVideo.dsp
+++ b/win32/plugins/dfxvideo/DFXVideo.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".\winsrc" /I "..\.." /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\dfxvideo" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__i386__" /FR /YX /FD /c

+# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".\\" /I ".\winsrc" /I "..\.." /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\dfxvideo" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__i386__" /FR /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "NDEBUG"

@@ -73,7 +73,7 @@ PostBuild_Cmds=rem copy release\DFXVideo.dll  d:\emus\epsxe\plugins	rem copy rel
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\winsrc" /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\dfxvideo" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\dfxvideo" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

@@ -124,14 +124,6 @@ SOURCE=.\winsrc\cfg.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\winsrc\DFXVideo.def

-# End Source File

-# Begin Source File

-

-SOURCE=.\winsrc\DFXVideo.rc

-# End Source File

-# Begin Source File

-

 SOURCE=.\winsrc\draw.c

 # End Source File

 # Begin Source File

@@ -140,10 +132,6 @@ SOURCE=.\winsrc\fps.c
 # End Source File

 # Begin Source File

 

-SOURCE=.\winsrc\gpu.bmp

-# End Source File

-# Begin Source File

-

 SOURCE=.\winsrc\key.c

 # End Source File

 # Begin Source File

@@ -156,10 +144,6 @@ SOURCE=.\winsrc\record.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\winsrc\resource.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\winsrc\winmain.c

 # End Source File

 # End Group

@@ -239,5 +223,17 @@ SOURCE=..\..\..\plugins\dfxvideo\swap.h
 SOURCE=..\..\..\plugins\dfxvideo\zn.c

 # End Source File

 # End Group

+# Begin Source File

+

+SOURCE=.\DFXVideo.def

+# End Source File

+# Begin Source File

+

+SOURCE=.\DFXVideo.rc

+# End Source File

+# Begin Source File

+

+SOURCE=.\resource.h

+# End Source File

 # End Target

 # End Project

diff --git a/win32/plugins/dfxvideo/winsrc/DFXVideo.rc b/win32/plugins/dfxvideo/DFXVideo.rc
index 37643c7c..946dc14b 100644
--- a/win32/plugins/dfxvideo/winsrc/DFXVideo.rc
+++ b/win32/plugins/dfxvideo/DFXVideo.rc
@@ -18,7 +18,7 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

+#pragma code_page(936)

 #endif //_WIN32

 

 /////////////////////////////////////////////////////////////////////////////

@@ -26,7 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Bitmap

 //

 

-IDB_GPU                 BITMAP  DISCARDABLE     "gpu.bmp"

+IDB_GPU                 BITMAP  DISCARDABLE     "res\\gpu.bmp"

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

@@ -460,6 +460,7 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

+#ifdef _MSC_VER

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -522,6 +523,7 @@ BEGIN
     0

 END

 

+#endif

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/win32/plugins/dfxvideo/winsrc/gpu.bmp b/win32/plugins/dfxvideo/res/gpu.bmp
index 02d41302..02d41302 100644
--- a/win32/plugins/dfxvideo/winsrc/gpu.bmp
+++ b/win32/plugins/dfxvideo/res/gpu.bmp
diff --git a/win32/plugins/dfxvideo/winsrc/resource.h b/win32/plugins/dfxvideo/resource.h
index 187dee48..aa7462c2 100644
--- a/win32/plugins/dfxvideo/winsrc/resource.h
+++ b/win32/plugins/dfxvideo/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Developer Studio generated include file.

-// Used by gpuPeopsSoft.rc

+// Used by DFXVideo.rc

 //

 #define IDS_INFO0                       1

 #define IDS_INFO1                       2