piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

wxw implements wxEVT_THREAD itself now

Browse Source
This commit is contained in:
Shawn Hoffman
2012-03-17 18:13:02 -07:00
parent a648aca65c
commit 1fbf2e38c4
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -109,9 +109,7 @@ if sys.platform == 'darwin':
env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic'] env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof'] env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['CC'] = 'clang' env['CC'] = 'clang'
env['CC'] = 'llvm-gcc'
env['CXX'] = 'clang++' env['CXX'] = 'clang++'
env['CXX'] = 'llvm-g++'
env['CXXFLAGS'] += ['-x', 'objective-c++'] env['CXXFLAGS'] += ['-x', 'objective-c++']
env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs'] env['LINKFLAGS'] += ['-Wl,-dead_strip,-dead_strip_dylibs']

1
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -29,7 +29,6 @@
#define NETPLAY_TITLEBAR "Dolphin NetPlay" #define NETPLAY_TITLEBAR "Dolphin NetPlay"
DEFINE_EVENT_TYPE(wxEVT_THREAD)
BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread) EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
END_EVENT_TABLE() END_EVENT_TABLE()

2
Source/Core/DolphinWX/Src/NetWindow.h
View File

@ -114,8 +114,6 @@ private:
static NetPlayDiag* npd; static NetPlayDiag* npd;
}; };
DECLARE_EVENT_TYPE(wxEVT_THREAD, -1)
class ChangeGameDiag : public wxDialog class ChangeGameDiag : public wxDialog
{ {
public: public: