ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxGui: Doesn't *quite* compile in Linux, but it's close. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1072 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-04-27 11:28:20 +00:00
parent 5d36fe3839
commit 172f933986
16 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/DebugTools/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libDebugTools.a
libDebugTools_a_SOURCES = \

2
pcsx2/Exceptions.h
View File

@ -250,7 +250,7 @@ namespace Exception
RuntimeError( msg ) {}
explicit CpuStateShutdown( const wxString& msg_eng, const wxString& msg_xlt=wxString() ) :
RuntimeError( msg_eng, msg_xlt.IsEmpty() ? _("Unexpected emulation shutdown") : msg_xlt ) { }
RuntimeError( msg_eng, msg_xlt.IsEmpty() ? wxT("Unexpected emulation shutdown") : msg_xlt ) { }
};
// ------------------------------------------------------------------------

2
pcsx2/IPU/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/../ -I@srcdir@/../x86 -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
INCLUDES = -I@srcdir@/../ -I@srcdir@/../x86 -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libIPU.a
libIPU_a_SOURCES = IPU.cpp yuv2rgb.cpp coroutine.cpp \

2
pcsx2/IPU/mpeg2lib/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libmpeg2IPU.a
libmpeg2IPU_a_SOURCES = Idct.cpp Mpeg.cpp Mpeg.h Vlc.h

2
pcsx2/IopHw.cpp
View File

@ -670,7 +670,7 @@ void psxHwWrite8(u32 add, u8 value) {
if (value == '\n' || g_pbufi >= 1023) { // A line break, or the buffer is about to overflow.
g_pbuf[g_pbufi++] = 0;
g_pbufi = 0;
DevCon::WriteLn( Color_Cyan, g_pbuf );
DevCon::WriteLn( Color_Cyan, "%s", params g_pbuf );
}
else g_pbuf[g_pbufi++] = value;
psxHu8(add) = value;

2
pcsx2/Linux/Makefile.am
View File

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty $(shell wx-config --cppflags)
bin_PROGRAMS = pcsx2

4
pcsx2/Makefile.am
View File

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I@srcdir@/x86/ -I@srcdir@/../common/include -I@srcdir@/../3rdparty
INCLUDES = -I@srcdir@/x86/ -I@srcdir@/../common/include -I@srcdir@/../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libpcsx2.a
libpcsx2_a_SOURCES = \
@ -13,8 +13,6 @@ VU0.cpp VU0micro.cpp VU0microInterp.cpp VU1micro.cpp VU1microInterp.cpp VUflags.
Vif.cpp VifDma.cpp vssprintf.cpp vtlb.cpp xmlpatchloader.cpp AlignedMalloc.cpp \
RecoverySystem.cpp Saveslots.cpp Dump.cpp
libpcsx2_a_SOURCES += \
CDVD.h CDVDiso.h CDVDisodrv.h CDVDlib.h COP0.h Cache.h CdRom.h Common.h Counters.h Decode_XA.h EEregs.h \
Elfheader.h Exceptions.h GS.h Hw.h IopBios.h IopBios2.h IopCounters.h IopDma.h IopHw.h IopMem.h IopSio2.h Memcpyfast.h \

6
pcsx2/NewGUI/Makefile.am
View File

@ -5,8 +5,10 @@ bin_PROGRAMS = pcsx2
# the application source, library search path, and link libraries
pcsx2_SOURCES = \
frmGameFixes.cpp frmGameFixes.h frmMain.cpp frmMain.h frmLogging.cpp frmLogging.h main.cpp \
memzero.h
CheckedStaticBox.cpp ConsoleLogger.cpp MainFrame.cpp wxHelpers.cpp AppConfig.cpp main.cpp \
App.h CheckedStaticBox.h MainFrame.h wxHelpers.h \
Dialogs/AboutBoxDialog.cpp Dialogs/GameFixesDialog.cpp Dialogs/LogOptionsDialog.cpp \
Dialogs/AboutBoxDialog.h Dialogs/GameFixesDialog.h Dialogs/LogOptionsDialog.h ../Linux/memzero.h
pcsx2_LDFLAGS =

2
pcsx2/NewGUI/wxHelpers.cpp
View File

@ -67,7 +67,7 @@ void wxDialogWithHelpers::AddOkCancel( wxBoxSizer &sizer )
#ifndef __WXMSW__
// create a sizer to hold the help and ok/cancel buttons.
buttonSizer = new wxBoxSizer( wxHORIZONTAL );
buttonSizer->Add( new wxContextHelpButton(this), stdButtonSizerFlags.Align( wxALIGN_LEFT ) );
buttonSizer->Add( new wxContextHelpButton(this), wxHelpers::stdButtonSizerFlags.Align( wxALIGN_LEFT ) );
#endif
}
buttonSizer->Add( CreateStdDialogButtonSizer( wxOK | wxCANCEL ), wxHelpers::stdButtonSizerFlags );

5
pcsx2/PathUtils.cpp
View File

@ -43,8 +43,9 @@ static const wxString Delimiters( wxT("\\/") );
static const wxChar SeparatorExt( wxT('.') );
#else
static const char Separator = '/';
static const char Delimiters( '/' );
static const wxChar Separator( '/');
static const wxChar Delimiters( '/' );
static const wxChar SeparatorExt( wxT('.') );
#endif
static bool IsPathSeparator( wxChar src )

7
pcsx2/PrecompiledHeader.h
View File

@ -19,9 +19,10 @@
#define NOMINMAX // Disables other libs inclusion of their own min/max macros (we use std instead)
#if defined (__linux__) // some distributions are lower case
# define __LINUX__
#endif
// __LINUX__ defined in wxWidgets.
//#if defined (__linux__) // some distributions are lower case
//# define __LINUX__
//#endif
#ifdef _WIN32
// disable warning C4244: '=' : conversion from 'big' to 'small', possible loss of data

2
pcsx2/RDebug/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libRDebug.a
libRDebug_a_SOURCES = \

2
pcsx2/RDebug/deci2_ttyp.cpp
View File

@ -36,7 +36,7 @@ void sendTTYP(u16 protocol, u8 source, char *data){
((DECI2_TTYP_HEADER*)tmp)->h.destination='H';
((DECI2_TTYP_HEADER*)tmp)->flushreq =0;
if (((DECI2_TTYP_HEADER*)tmp)->h.length>2048)
Msgbox::Alert("TTYP: Buffer overflow");
Msgbox::Alert(wxT("TTYP: Buffer overflow"));
else
memcpy(&tmp[sizeof(DECI2_TTYP_HEADER)], data, strlen(data));
//writeData(tmp);

16
pcsx2/x86/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../IPU/ -I@srcdir@/../../3rdparty
INCLUDES = -I@srcdir@/../ -I@srcdir@/../../common/include -I@srcdir@/../IPU/ -I@srcdir@/../../3rdparty $(shell wx-config --cppflags)
noinst_LIBRARIES = libx86recomp.a
# have to add the sources instead of making a library since the linking is complicated
@ -8,13 +8,13 @@ ix86-32/iR5900Shift.cpp ix86-32/iR5900Arit.cpp ix86-32/iR5900Branch.cpp ix86-32
ix86-32/iR5900MultDiv.cpp ix86-32/iCore-32.cpp ix86-32/aR5900-32.S ix86-32/iR5900Templates.cpp ix86-32/recVTLB.cpp
libx86recomp_a_SOURCES = \
BaseblockEx.cpp iCOP0.cpp iCOP2.cpp iCore.cpp iFPU.cpp iFPUd.cpp iMMI.cpp iPsxMem.cpp iR3000A.cpp iR3000Atables.cpp \
iR5900Misc.cpp iVU0micro.cpp iVU1micro.cpp iVUmicro.cpp iVUmicroLower.cpp iVUmicroUpper.cpp iVUzerorec.cpp iVif.cpp \
ir5900tables.cpp fast_routines.S aR3000A.S aVUzerorec.S aVif.S $(archfiles)
libx86recomp_a_SOURCES += \
BaseblockEx.h iCOP0.h iCore.h iFPU.h iMMI.h iR3000A.h iR5900.h iR5900Arit.h iR5900AritImm.h iR5900Branch.h iR5900Jump.h \
iR5900LoadStore.h iR5900Move.h iR5900MultDiv.h iR5900Shift.h iVUmicro.h iVUops.h iVUzerorec.h
BaseblockEx.cpp iCore.cpp iMMI.h iR5900AritImm.h iR5900MultDiv.h ir5900tables.cpp \
BaseblockEx.h iCore.h iPsxMem.cpp iR5900Branch.h iR5900Shift.h \
iFPU.cpp iR3000A.h iR5900Jump.h iVUops.h iR3000A.cpp \
iCOP0.cpp iFPU.h iR3000Atables.cpp iR5900LoadStore.h iVU1micro.cpp iVUzerorec.cpp \
iCOP0.h iFPUd.cpp iR5900.h iR5900Misc.cpp iVUzerorec.h \
iCOP2.cpp iMMI.cpp iR5900Arit.h iR5900Move.h iVif.cpp \
fast_routines.S aR3000A.S aVUzerorec.S aVif.S $(archfiles)
#ifdef PCSX2_MICROVU
#libx86recomp_a_SOURCES += \

4
pcsx2/x86/iVUzerorec.cpp
View File

@ -608,7 +608,7 @@ void SuperVUDumpBlock(list<VuBaseBlock*>& blocks, int vuindex)
#ifdef __LINUX__
// dump the asm
if( (*itblock)->pcode != NULL ) {
/* if( (*itblock)->pcode != NULL ) {
char command[255];
FILE* fasm = fopen( "mydump1", "wb" );
//Console::WriteLn("writing: %x, %x", params (*itblock)->startpc, (uptr)(*itblock)->pendcode - (uptr)(*itblock)->pcode);
@ -626,7 +626,7 @@ void SuperVUDumpBlock(list<VuBaseBlock*>& blocks, int vuindex)
fprintf(f, "\n\n");
fwrite(&vbuffer[0], vbuffer.size(), 1, f);
fclose(fasm);
}
}*/
#endif
eff.Printf("\n---------------\n");

2
pcsx2/x86/ix86/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I@srcdir@/.. -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty -I/implement -I/implement/xmm
INCLUDES = -I@srcdir@/.. -I@srcdir@/../../ -I@srcdir@/../../../common/include -I@srcdir@/../../../3rdparty -I/implement -I/implement/xmm $(shell wx-config --cppflags)
noinst_LIBRARIES = libix86.a
libix86_a_SOURCES = \