xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

windows fix

Browse Source 
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47545 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\weimingzhi_cp 2010-05-07 04:46:57 +00:00
parent 2d5a9a0242
commit cb7447b223
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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.

8
win32/gui/WndMain.c
View File

@ -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;

12
win32/pcsx.dev
View File

@ -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)

22
win32/pcsx.vcproj
View File

@ -532,6 +532,28 @@
RelativePath="..\libpcsxcore\psxbios.h"
>
</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"
>