diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-02 08:02:58 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-02 08:02:58 +0000 |
| commit | c0f88037121599caca26fe87e78dd2a837faf544 (patch) | |
| tree | 96a133f87031148632f8bc9125a18fb103260a05 /win32/plugins | |
| parent | d4a2f0051ab1a43fbf2376ec905319797a1fdc3c (diff) | |
| download | pcsxr-c0f88037121599caca26fe87e78dd2a837faf544.tar.gz | |
dfxvideo, peopsxgl (win32): Fixed FTBFS.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61695 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'win32/plugins')
| -rw-r--r-- | win32/plugins/dfxvideo/DFXVideo.dev | 2 | ||||
| -rw-r--r-- | win32/plugins/dfxvideo/DFXVideo.dsp | 4 | ||||
| -rw-r--r-- | win32/plugins/peopsxgl/gpuPeopsOpenGL.dev | 2 | ||||
| -rw-r--r-- | win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/win32/plugins/dfxvideo/DFXVideo.dev b/win32/plugins/dfxvideo/DFXVideo.dev index 73a6369e..0da41d81 100644 --- a/win32/plugins/dfxvideo/DFXVideo.dev +++ b/win32/plugins/dfxvideo/DFXVideo.dev @@ -6,7 +6,7 @@ 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
+Includes=.\\;.\winsrc;..\..;..\..\glue;..\..\..\plugins\dfxvideo;..\..\..\libpcsxcore
Linker=-luser32 -lgdi32 -lwinmm -ladvapi32 -lvfw32 -def DFXVideo.def --enable-stdcall-fixup_@@_
Libs=
UnitCount=33
diff --git a/win32/plugins/dfxvideo/DFXVideo.dsp b/win32/plugins/dfxvideo/DFXVideo.dsp index 3d2e5eaf..ee0a52b2 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 ".\\" /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 "..\..\..\plugins\dfxvideo" /I "..\..\..\libpcsxcore" /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 ".\\" /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 "..\..\..\plugins\dfxvideo" /I "..\..\..\libpcsxcore" /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"
diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dev b/win32/plugins/peopsxgl/gpuPeopsOpenGL.dev index a78f6262..364e1ef8 100644 --- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dev +++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.dev @@ -6,7 +6,7 @@ IsCpp=1 Type=3
Compiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
CppCompiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
-Includes=.\\;.\winsrc;..\..\glue;..\..\..\libpcsxcore;..\..\..\plugins\peopsxgl
+Includes=.\\;.\winsrc;..\..\glue;..\..\..\plugins\peopsxgl;..\..\..\libpcsxcore
Linker=-luser32 -lgdi32 -lopengl32 -lwinmm -ladvapi32 -def gpuPeopsOpenGL.def --enable-stdcall-fixup_@@_
Libs=
UnitCount=27
diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp b/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp index ac45de5d..3c041f24 100644 --- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.dsp +++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.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 ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\peopsxgl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\plugins\peopsxgl" /I "..\..\..\libpcsxcore" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /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"
@@ -72,7 +72,7 @@ PostBuild_Cmds=rem copy release\*.dll d:\emus\epsxe\plugins # PROP Intermediate_Dir "Debug"
# 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 ".\\" /I ".\winsrc" /I "..\..\glue" /I "..\..\..\libpcsxcore" /I "..\..\..\plugins\peopsxgl" /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 "..\..\..\plugins\peopsxgl" /I "..\..\..\libpcsxcore" /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"
|