diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-23 09:56:43 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-23 09:56:43 +0000 |
| commit | 5a9cb676851004643088a9a323d4dd309c7d3cfb (patch) | |
| tree | 4f5ef8702e78c68094ead190f4d33a8c556d2214 | |
| parent | c74ebcc191b3d1d25627f131866648c085028633 (diff) | |
| download | pcsxr-5a9cb676851004643088a9a323d4dd309c7d3cfb.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@40656 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libpcsxcore/r3000a.c | 3 | ||||
| -rw-r--r-- | win32/pcsx.dev | 22 | ||||
| -rw-r--r-- | win32/pcsx.dsp | 8 |
4 files changed, 34 insertions, 3 deletions
@@ -14,7 +14,9 @@ January 23, 2010 Wei Mingzhi <weimingzhi@gmail.com> * win32/gui/WndMain.c: Likewise. * macosx/main.m: Likewise. * macosx/PcsxController.m: Likewise. - * libpcsxcore/Makefile.am: Added ppf.c and ppf.h. + * libpcsxcore/Makefile.am: Added ppf.c and ppf.h.
+ * win32/pcsx.dsp: Likewise.
+ * win32/pcsx.dev: Likewise. * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/pcsx.pot: Updated. January 7, 2010 Wei Mingzhi <weimingzhi@gmail.com> diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 8873336f..6a8a7051 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -26,7 +26,8 @@ #include "cdrom.h" #include "mdec.h" #include "gte.h" -#include "cheat.h" +#include "cheat.h"
+#include "ppf.h" psxRegisters psxRegs; diff --git a/win32/pcsx.dev b/win32/pcsx.dev index 23aa1a02..807befcd 100644 --- a/win32/pcsx.dev +++ b/win32/pcsx.dev @@ -9,7 +9,7 @@ CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl
Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32 -lwsock32_@@_
Libs=
-UnitCount=109
+UnitCount=111
Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
ObjFiles=
PrivateResource=pcsx_private.rc
@@ -1137,3 +1137,23 @@ Priority=1000 OverrideBuildCmd=0
BuildCmd=$(CC) -c socket.c -o socket.o $(CFLAGS)
+[Unit110]
+FileName=..\libpcsxcore\ppf.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=..\libpcsxcore\ppf.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c ppf.c -o ppf.o $(CFLAGS)
+
diff --git a/win32/pcsx.dsp b/win32/pcsx.dsp index 1fb8b30c..e72f9a35 100644 --- a/win32/pcsx.dsp +++ b/win32/pcsx.dsp @@ -192,6 +192,14 @@ SOURCE=..\libpcsxcore\plugins.h # End Source File
# Begin Source File
+SOURCE=..\libpcsxcore\ppf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpcsxcore\ppf.h
+# End Source File
+# Begin Source File
+
SOURCE=..\libpcsxcore\psemu_plugin_defs.h
# End Source File
# Begin Source File
|