diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-09-20 17:31:54 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-09-20 17:31:54 +0000 |
| commit | 720efb825d8c91eb5f2b5f6aa24e8f4daeedb4db (patch) | |
| tree | ab96e70a7da4a79be15e2a835fb1da78b001bdd3 /Source/Core | |
| parent | 66011849cd5f66c53b7e046bfbffe41711c835d3 (diff) | |
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
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DebuggerWX/src/SConscript | 4 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/Filesystem.h | 10 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/Volume.h | 10 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/FilesystemViewer.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/DebuggerWX/src/SConscript b/Source/Core/DebuggerWX/src/SConscript index 5532bf23b7..522e36bbf4 100644 --- a/Source/Core/DebuggerWX/src/SConscript +++ b/Source/Core/DebuggerWX/src/SConscript @@ -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" ]) diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h index b2532a3206..d8f1469080 100644 --- a/Source/Core/DiscIO/Src/Filesystem.h +++ b/Source/Core/DiscIO/Src/Filesystem.h @@ -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:
diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index c6448dfbbb..075addc815 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -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
diff --git a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp index 7187998a2b..72f08ad8e9 100644 --- a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp +++ b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp @@ -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();
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index b0e6c9585a..1bfa1b10d6 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -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`' ]) ) |