diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-07 04:46:57 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-07 04:46:57 +0000 |
| commit | cb7447b2232a6029c9411afaf55b602797b45583 (patch) | |
| tree | 599bbecfdbc761c554181bf7d2eafb9cacdf1b43 | |
| parent | 2d5a9a02425951f4efed764d135be96867eb532f (diff) | |
| download | pcsxr-cb7447b2232a6029c9411afaf55b602797b45583.tar.gz | |
windows fix
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47545 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | win32/gui/WndMain.c | 8 | ||||
| -rw-r--r-- | win32/pcsx.dev | 12 | ||||
| -rw-r--r-- | win32/pcsx.vcproj | 22 |
4 files changed, 40 insertions, 5 deletions
@@ -29,8 +29,11 @@ May 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> * libpcsxcore/ix86_64/ix86-64.c: Likewise. * gui/LnxMain.c: Likewise. * gui/Gtk2Gui.c: Likewise. + * win32/WndMain.c: Likewise. * libpcsxcore/psxcommon.c: Added. * win32/pcsx.dsp: Added psxcommon.c. + * win32/pcsx.dev: Likewise. + * win32/pcsx.vcproj: Likewise. * libpcsxcore/Makefile.am: Likewise. * autogen.sh: Run autoreconf as well. * AUTHORS: Updated info. diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index 7a86e9ac..1451c575 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -1728,7 +1728,7 @@ void SysClose() { if (emuLog != NULL) fclose(emuLog);
}
-void SysPrintf(char *fmt, ...) {
+void SysPrintf(const char *fmt, ...) {
va_list list;
char msg[512];
DWORD tmp;
@@ -1747,7 +1747,7 @@ void SysPrintf(char *fmt, ...) { #endif
}
-void SysMessage(char *fmt, ...) {
+void SysMessage(const char *fmt, ...) {
va_list list;
char tmp[512];
@@ -1760,11 +1760,11 @@ void SysMessage(char *fmt, ...) { static char *err = N_("Error Loading Symbol");
static int errval;
-void *SysLoadLibrary(char *lib) {
+void *SysLoadLibrary(const char *lib) {
return LoadLibrary(lib);
}
-void *SysLoadSym(void *lib, char *sym) {
+void *SysLoadSym(void *lib, const char *sym) {
void *tmp = GetProcAddress((HINSTANCE)lib, sym);
if (tmp == NULL) errval = 1;
else errval = 0;
diff --git a/win32/pcsx.dev b/win32/pcsx.dev index 807befcd..13328e20 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=111
+UnitCount=112
Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
ObjFiles=
PrivateResource=pcsx_private.rc
@@ -1157,3 +1157,13 @@ Priority=1000 OverrideBuildCmd=0
BuildCmd=$(CC) -c ppf.c -o ppf.o $(CFLAGS)
+[Unit112]
+FileName=..\libpcsxcore\psxcommon.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c psxcommon.c -o psxcommon.o $(CFLAGS)
+
diff --git a/win32/pcsx.vcproj b/win32/pcsx.vcproj index 694c830b..a9e7c1be 100644 --- a/win32/pcsx.vcproj +++ b/win32/pcsx.vcproj @@ -533,6 +533,28 @@ >
</File>
<File
+ RelativePath="..\libpcsxcore\psxcommon.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\libpcsxcore\psxcommon.h"
>
</File>
|