piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: I made Sconscript call wx-config inside of the main SConstruct, added a nowx argument, Made the filesystemviewer use the correct struct and fixed a silly scissor error that was made

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-09-20 17:31:54 +00:00
parent 66011849cd
commit 720efb825d
11 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DebuggerWX/src/SConscript
View File

@ -18,14 +18,14 @@ files = ["LogWindow.cpp",
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
'`wx-config --cppflags`',
env['WXCPPFLAGS'],
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP'
]),
LINKFLAGS = ' ' + ' '.join([
'-L/usr/local/lib',
'-pthread',
'`wx-config --libs --debug`'
env['WXLIBFLAGS'],
])
)
wxenv.StaticLibrary("debwx", files, LIBS = [ "common" ])

10
Source/Core/DiscIO/Src/Filesystem.h
View File

@ -22,6 +22,16 @@
namespace DiscIO
{
// file info of an FST entry
struct SFileInfo
{
u32 m_NameOffset;
u64 m_Offset;
u32 m_FileSize;
char m_FullPath[512];
bool IsDirectory() {return((m_NameOffset& 0xFF000000) != 0 ? true : false);}
};
class IFileSystem
{
public:

10
Source/Core/DiscIO/Src/Volume.h
View File

@ -23,16 +23,6 @@
#include "Common.h"
// file info of an FST entry
struct SFileInfo
{
u32 m_NameOffset;
u64 m_Offset;
u32 m_FileSize;
char m_FullPath[512];
bool IsDirectory() {return((m_NameOffset& 0xFF000000) != 0 ? true : false);}
};
namespace DiscIO
{
class IVolume

2
Source/Core/DolphinWX/Src/FilesystemViewer.cpp
View File

@ -41,7 +41,7 @@ CFilesystemViewer::CFilesystemViewer(const std::string fileName, wxWindow* paren
{
OpenIso = DiscIO::CreateVolumeFromFilename(fileName);
pFileSystem = DiscIO::CreateFileSystem(*OpenIso);
std::vector<SFileInfo> Our_Files;
std::vector<DiscIO::SFileInfo> Our_Files;
pFileSystem->GetFileList(&Our_Files);
CreateGUIControls();

4
Source/Core/DolphinWX/Src/SConscript
View File

@ -24,7 +24,7 @@ libs = [
wxenv = env.Clone()
wxenv.Append(
CXXFLAGS = ' ' + ' '.join([
'`wx-config --cppflags`',
env['WXCPPFLAGS'],
'-DUSE_XPM_BITMAPS',
'-DwxNEEDS_CHARPP',
'`sdl-config --cflags`',
@ -32,7 +32,7 @@ wxenv.Append(
LINKFLAGS = ' ' + ' '.join([
'-L/usr/local/lib',
'-pthread',
'`wx-config --libs`',
env['WXLIBFLAGS'],
'`sdl-config --libs`'
])
)

10
Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
View File

@ -561,9 +561,9 @@ void SetColorMask()
bool SetScissorRect()
{
int xoff = bpmem.scissorOffset.x*2-342;
int yoff = bpmem.scissorOffset.y*2-342;
//printf("xoff: %d yoff: %d\n", xoff, yoff);
int xoff = bpmem.scissorOffset.x * 2 - 342;
int yoff = bpmem.scissorOffset.y * 2 - 342;
RECT rc;
rc.left = bpmem.scissorTL.x + xoff - 342;
rc.left *= MValueX;
@ -572,10 +572,10 @@ bool SetScissorRect()
rc.top *= MValueY;
if (rc.top < 0) rc.top = 0;
rc.right = bpmem.scissorBR.x + xoff - 342 +1;
rc.right = bpmem.scissorBR.x + xoff - 342;
rc.right *= MValueX;
if (rc.right > 640 * MValueX) rc.right = 640 * MValueX;
rc.bottom = bpmem.scissorBR.y + yoff - 342 +1;
rc.bottom = bpmem.scissorBR.y + yoff - 342;
rc.bottom *= MValueY;
if (rc.bottom > 480 * MValueY) rc.bottom = 480 * MValueY;

4
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -24,10 +24,10 @@ files = [
]
compileFlags = [
'-fPIC',
'`wx-config --cppflags`',
env['WXCPPFLAGS'],
]
linkFlags = [
'`wx-config --libs`',
env['WXLIBFLAGS'],
]
libs = [
'videocommon', 'common', 'GLEW',

4
Source/Plugins/Plugin_Wiimote_Test/Src/SConscript
View File

@ -13,10 +13,10 @@ files = [
padenv = env.Clone()
padenv.Append(
CXXFLAGS = ' ' + ' '.join([
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
'-fPIC', env['WXCPPFLAGS'], '`pkg-config --cflags sdl`'
]),
LINKFLAGS = ' ' + ' '.join([
'`wx-config --libs`', '`pkg-config --libs sdl`'
env['WXLIBFLAGS'], '`pkg-config --libs sdl`'
])
)
padenv.SharedLibrary(output, files, LIBS = [ "common" ])

2
Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
View File

@ -144,7 +144,7 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo)
extern "C" void DllAbout(HWND _hParent)
{
wxAboutDialogInfo info;
info.SetName("Wiimote test plugin");
info.SetName(_T("Wiimote test plugin"));
info.AddDeveloper(_T("masken (masken3@gmail.com)"));
info.SetDescription(_T("Wiimote test plugin"));
wxAboutBox(info);

4
Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
View File

@ -15,10 +15,10 @@ files = [
padenv = env.Clone()
padenv.Append(
CXXFLAGS = ' ' + ' '.join([
'-fPIC', '`wx-config --cppflags`', '`pkg-config --cflags sdl`'
'-fPIC', env['WXCPPFLAGS'], '`pkg-config --cflags sdl`'
]),
LINKFLAGS = ' ' + ' '.join([
'`wx-config --libs`', '`pkg-config --libs sdl`'
env['WXLIBFLAGS'], '`pkg-config --libs sdl`'
])
)
padenv.SharedLibrary(output, files, LIBS = [ "common" ])