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

Fix some 'o dat Linux thang! 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2080 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-25 23:21:46 +00:00
parent 581e8a30a7
commit eea8ff9767
5 changed files with 138 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
common/build/Utilities/Utilities.cbp
View File

@ -1,127 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="6" /> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="Utilities" /> <Option title="Utilities" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="../../../deps/debug/libUtilities" prefix_auto="1" extension_auto="1" /> <Option output="../../../deps/debug/libUtilities" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="./.objs/debug/" /> <Option object_output="./.objs/debug/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="../../../deps/release/libUtilities" prefix_auto="1" extension_auto="1" /> <Option output="../../../deps/release/libUtilities" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="./.objs/release/" /> <Option object_output="./.objs/release/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
</Linker> </Linker>
</Target> </Target>
<Target title="Devel"> <Target title="Devel">
<Option output="../../../deps/devel/libUtilities" prefix_auto="1" extension_auto="1" /> <Option output="../../../deps/devel/libUtilities" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="./.objs/devel/" /> <Option object_output="./.objs/devel/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" /> <Add option="-DPCSX2_DEVEL" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
</Compiler> </Compiler>
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" /> <Add option="-march=i486" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
<Add option="-Wunused-variable" /> <Add option="-Wunused-variable" />
<Add option="-fno-guess-branch-probability" /> <Add option="-fno-guess-branch-probability" />
<Add option="-fno-dse" /> <Add option="-fno-dse" />
<Add option="-fno-tree-dse" /> <Add option="-fno-tree-dse" />
<Add option="-fno-strict-aliasing" /> <Add option="-fno-strict-aliasing" />
<Add option="-pipe -msse -msse2" /> <Add option="-pipe -msse -msse2" />
<Add option="-m32" /> <Add option="-m32" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../../3rdparty" /> <Add directory="../../../3rdparty" />
</Compiler> </Compiler>
<Unit filename="../../../3rdparty/google/dense_hash_map" /> <Unit filename="../../../3rdparty/google/dense_hash_map" />
<Unit filename="../../../3rdparty/google/dense_hash_set" /> <Unit filename="../../../3rdparty/google/dense_hash_set" />
<Unit filename="../../../3rdparty/google/sparse_hash_map" /> <Unit filename="../../../3rdparty/google/sparse_hash_map" />
<Unit filename="../../../3rdparty/google/sparse_hash_set" /> <Unit filename="../../../3rdparty/google/sparse_hash_set" />
<Unit filename="../../../3rdparty/google/sparsehash/densehashtable.h" /> <Unit filename="../../../3rdparty/google/sparsehash/densehashtable.h" />
<Unit filename="../../../3rdparty/google/sparsehash/sparseconfig.h" /> <Unit filename="../../../3rdparty/google/sparsehash/sparseconfig.h" />
<Unit filename="../../../3rdparty/google/sparsehash/sparsehashtable.h" /> <Unit filename="../../../3rdparty/google/sparsehash/sparsehashtable.h" />
<Unit filename="../../../3rdparty/google/sparsetable" /> <Unit filename="../../../3rdparty/google/sparsetable" />
<Unit filename="../../../3rdparty/google/type_traits.h" /> <Unit filename="../../../3rdparty/google/type_traits.h" />
<Unit filename="../../include/Utilities/Console.h" /> <Unit filename="../../include/Utilities/Console.h" />
<Unit filename="../../include/Utilities/Dependencies.h" /> <Unit filename="../../include/Utilities/Dependencies.h" />
<Unit filename="../../include/Utilities/EventSource.h" /> <Unit filename="../../include/Utilities/EventSource.h" />
<Unit filename="../../include/Utilities/Exceptions.h" /> <Unit filename="../../include/Utilities/EventSource.inl" />
<Unit filename="../../include/Utilities/General.h" /> <Unit filename="../../include/Utilities/Exceptions.h" />
<Unit filename="../../include/Utilities/HashMap.h" /> <Unit filename="../../include/Utilities/General.h" />
<Unit filename="../../include/Utilities/MemcpyFast.h" /> <Unit filename="../../include/Utilities/HashMap.h" />
<Unit filename="../../include/Utilities/Path.h" /> <Unit filename="../../include/Utilities/MemcpyFast.h" />
<Unit filename="../../include/Utilities/RedtapeWindows.h" /> <Unit filename="../../include/Utilities/Path.h" />
<Unit filename="../../include/Utilities/SafeArray.h" /> <Unit filename="../../include/Utilities/RedtapeWindows.h" />
<Unit filename="../../include/Utilities/ScopedPtr.h" /> <Unit filename="../../include/Utilities/SafeArray.h" />
<Unit filename="../../include/Utilities/StringHelpers.h" /> <Unit filename="../../include/Utilities/ScopedPtr.h" />
<Unit filename="../../include/Utilities/Threading.h" /> <Unit filename="../../include/Utilities/StringHelpers.h" />
<Unit filename="../../include/Utilities/lnx_memzero.h" /> <Unit filename="../../include/Utilities/Threading.h" />
<Unit filename="../../include/Utilities/wxBaseTools.h" /> <Unit filename="../../include/Utilities/lnx_memzero.h" />
<Unit filename="../../include/Utilities/wxGuiTools.h" /> <Unit filename="../../include/Utilities/wxBaseTools.h" />
<Unit filename="../../include/intrin_x86.h" /> <Unit filename="../../include/Utilities/wxGuiTools.h" />
<Unit filename="../../src/Utilities/AlignedMalloc.cpp" /> <Unit filename="../../include/intrin_x86.h" />
<Unit filename="../../src/Utilities/Console.cpp" /> <Unit filename="../../src/Utilities/AlignedMalloc.cpp" />
<Unit filename="../../src/Utilities/Exceptions.cpp" /> <Unit filename="../../src/Utilities/Console.cpp" />
<Unit filename="../../src/Utilities/HashTools.cpp" /> <Unit filename="../../src/Utilities/EventSource.cpp" />
<Unit filename="../../src/Utilities/Linux/LnxHostSys.cpp" /> <Unit filename="../../src/Utilities/Exceptions.cpp" />
<Unit filename="../../src/Utilities/Linux/LnxMisc.cpp" /> <Unit filename="../../src/Utilities/HashTools.cpp" />
<Unit filename="../../src/Utilities/Linux/LnxThreads.cpp" /> <Unit filename="../../src/Utilities/Linux/LnxHostSys.cpp" />
<Unit filename="../../src/Utilities/Mutex.cpp" /> <Unit filename="../../src/Utilities/Linux/LnxMisc.cpp" />
<Unit filename="../../src/Utilities/PathUtils.cpp" /> <Unit filename="../../src/Utilities/Linux/LnxThreads.cpp" />
<Unit filename="../../src/Utilities/PrecompiledHeader.h" /> <Unit filename="../../src/Utilities/Mutex.cpp" />
<Unit filename="../../src/Utilities/Semaphore.cpp" /> <Unit filename="../../src/Utilities/PathUtils.cpp" />
<Unit filename="../../src/Utilities/StringHelpers.cpp" /> <Unit filename="../../src/Utilities/PrecompiledHeader.h" />
<Unit filename="../../src/Utilities/ThreadTools.cpp" /> <Unit filename="../../src/Utilities/Semaphore.cpp" />
<Unit filename="../../src/Utilities/ThreadingInternal.h" /> <Unit filename="../../src/Utilities/StringHelpers.cpp" />
<Unit filename="../../src/Utilities/vssprintf.cpp" /> <Unit filename="../../src/Utilities/ThreadTools.cpp" />
<Unit filename="../../src/Utilities/wxGuiTools.cpp" /> <Unit filename="../../src/Utilities/ThreadingInternal.h" />
<Unit filename="../../src/Utilities/x86/MemcpyFast.S" /> <Unit filename="../../src/Utilities/vssprintf.cpp" />
<Extensions> <Unit filename="../../src/Utilities/wxGuiTools.cpp" />
<envvars /> <Unit filename="../../src/Utilities/x86/MemcpyFast.S" />
<code_completion> <Extensions>
<search_path add="/usr/include/wx-2.8" /> <envvars />
</code_completion> <code_completion>
<debugger /> <search_path add="/usr/include/wx-2.8" />
</Extensions> </code_completion>
</Project> <debugger />
</CodeBlocks_project_file> </Extensions>
</Project>
</CodeBlocks_project_file>

3
common/include/Utilities/EventSource.h
View File

@ -25,7 +25,7 @@ class wxCommandEvent;
#if defined( __GNUC__ ) && (__GNUC__ < 4 ) || ((__GNUC__ == 4) && ( __GNUC_MINOR__ <= 3 )) #if defined( __GNUC__ ) && (__GNUC__ < 4 ) || ((__GNUC__ == 4) && ( __GNUC_MINOR__ <= 3 ))
# define __evt_fastcall # define __evt_fastcall
#else #else
# define __evt_fastcall _fastcall # define __evt_fastcall __fastcall
#endif #endif
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -188,6 +188,5 @@ typedef EventListenerBinding<wxCommandEvent> CmdEvt_ListenerBinding;
#define EventSource_ImplementType( tname ) \ #define EventSource_ImplementType( tname ) \
template void EventSource<tname>::Add(const EventSource<tname>::ListenerType &listener); \ template void EventSource<tname>::Add(const EventSource<tname>::ListenerType &listener); \
template void EventSource<tname>::RemoveObject(const void* object); \ template void EventSource<tname>::RemoveObject(const void* object); \
template void EventSource<tname>::Add(const EventSource<tname>::ListenerType &listener); \
template void EventSource<tname>::Dispatch(tname& evt); \ template void EventSource<tname>::Dispatch(tname& evt); \
template void EventSource<tname>::_DispatchRaw( EventSource<tname>::ConstIterator iter, const EventSource<tname>::ConstIterator& iend, tname& evt ); template void EventSource<tname>::_DispatchRaw( EventSource<tname>::ConstIterator iter, const EventSource<tname>::ConstIterator& iend, tname& evt );

6
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -1,6 +1,6 @@
/* PCSX2 - PS2 Emulator for PCs /* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team * Copyright (C) 2002-2009 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found- * of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -33,7 +33,7 @@ Panels::BaseSelectorPanel::BaseSelectorPanel( wxWindow& parent, int idealWidth )
Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler(PluginSelectorPanel::OnFolderChanged), NULL, this ); Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler(PluginSelectorPanel::OnFolderChanged), NULL, this );
} }
Panels::BaseSelectorPanel::~BaseSelectorPanel() Panels::BaseSelectorPanel::~BaseSelectorPanel() throw()
{ {
} }
@ -92,7 +92,7 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow& parent, int idealWidth )
SetSizer( &sizer ); SetSizer( &sizer );
} }
Panels::BiosSelectorPanel::~BiosSelectorPanel() Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()
{ {
} }

6
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -1,6 +1,6 @@
/* PCSX2 - PS2 Emulator for PCs /* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team * Copyright (C) 2002-2009 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found- * of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -367,7 +367,7 @@ namespace Panels
public: public:
BiosSelectorPanel( wxWindow& parent, int idealWidth ); BiosSelectorPanel( wxWindow& parent, int idealWidth );
virtual ~BiosSelectorPanel(); virtual ~BiosSelectorPanel() throw();
protected: protected:
virtual void Apply(); virtual void Apply();
@ -469,7 +469,7 @@ namespace Panels
ScopedPtr<EnumThread> m_EnumeratorThread; ScopedPtr<EnumThread> m_EnumeratorThread;
public: public:
virtual ~PluginSelectorPanel(); virtual ~PluginSelectorPanel() throw();
PluginSelectorPanel( wxWindow& parent, int idealWidth ); PluginSelectorPanel( wxWindow& parent, int idealWidth );
void CancelRefresh(); // used from destructor, stays non-virtual void CancelRefresh(); // used from destructor, stays non-virtual

4
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -253,7 +253,7 @@ Panels::PluginSelectorPanel::PluginSelectorPanel( wxWindow& parent, int idealWid
Connect( ButtonId_Configure, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginSelectorPanel::OnConfigure_Clicked ) ); Connect( ButtonId_Configure, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginSelectorPanel::OnConfigure_Clicked ) );
} }
Panels::PluginSelectorPanel::~PluginSelectorPanel() Panels::PluginSelectorPanel::~PluginSelectorPanel() throw()
{ {
CancelRefresh(); // in case the enumeration thread is currently refreshing... CancelRefresh(); // in case the enumeration thread is currently refreshing...
} }
@ -472,7 +472,7 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )
m_ComponentBoxes.Show(); m_ComponentBoxes.Show();
m_StatusPanel.Hide(); m_StatusPanel.Hide();
m_StatusPanel.Reset(); m_StatusPanel.Reset();
wxWindow* forwardButton = GetGrandParent()->FindWindow( wxID_FORWARD ); wxWindow* forwardButton = GetGrandParent()->FindWindow( wxID_FORWARD );
if( forwardButton != NULL ) if( forwardButton != NULL )
forwardButton->Enable(); forwardButton->Enable();