Remove the PIC linker flag for DSP on linux.
Fix some debugger issues. Still need to get sound window working, but the invalid id panic alert is fixed. Also, a ";" as a comment in an ini file is now only allowed at the beginning of a line. The debugger has settings strings with semicolons in them. That completely broke the debugger. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6989 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
db1765c425
commit
cde1c5bd60
|
@ -37,6 +37,3 @@ endif()
|
||||||
|
|
||||||
add_library(audiocommon STATIC ${SRCS})
|
add_library(audiocommon STATIC ${SRCS})
|
||||||
target_link_libraries(audiocommon ${LIBS})
|
target_link_libraries(audiocommon ${LIBS})
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
||||||
add_definitions(-fPIC)
|
|
||||||
endif()
|
|
||||||
|
|
|
@ -36,12 +36,11 @@ static void ParseLine(const std::string& line, std::string* keyOut, std::string*
|
||||||
int FirstCommentChar = -1;
|
int FirstCommentChar = -1;
|
||||||
|
|
||||||
// Comments
|
// Comments
|
||||||
if (FirstCommentChar < 0)
|
|
||||||
FirstCommentChar =
|
|
||||||
(int)line.find(";", FirstEquals > 0 ? FirstEquals : 0);
|
|
||||||
if (FirstCommentChar < 0)
|
if (FirstCommentChar < 0)
|
||||||
FirstCommentChar =
|
FirstCommentChar =
|
||||||
(int)line.find("#", FirstEquals > 0 ? FirstEquals : 0);
|
(int)line.find("#", FirstEquals > 0 ? FirstEquals : 0);
|
||||||
|
if (FirstCommentChar < 0 && line[0] == ';')
|
||||||
|
FirstCommentChar = 0;
|
||||||
|
|
||||||
// Allow preservation of spacing before comment
|
// Allow preservation of spacing before comment
|
||||||
if (FirstCommentChar > 0)
|
if (FirstCommentChar > 0)
|
||||||
|
|
|
@ -4,6 +4,3 @@ set(SRCS Src/CodeView.cpp
|
||||||
|
|
||||||
add_library(debugger_ui_util STATIC ${SRCS})
|
add_library(debugger_ui_util STATIC ${SRCS})
|
||||||
target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES})
|
target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES})
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
||||||
add_definitions(-fPIC)
|
|
||||||
endif()
|
|
||||||
|
|
|
@ -425,7 +425,7 @@ void CCodeWindow::OpenPages()
|
||||||
if (bShowOnStart[IDM_JITWINDOW - IDM_LOGWINDOW])
|
if (bShowOnStart[IDM_JITWINDOW - IDM_LOGWINDOW])
|
||||||
ToggleJitWindow(true);
|
ToggleJitWindow(true);
|
||||||
if (bShowOnStart[IDM_SOUNDWINDOW - IDM_LOGWINDOW])
|
if (bShowOnStart[IDM_SOUNDWINDOW - IDM_LOGWINDOW])
|
||||||
ToggleDLLWindow(IDM_SOUNDWINDOW, true);
|
ToggleSoundWindow(true);
|
||||||
if (bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW])
|
if (bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW])
|
||||||
ToggleDLLWindow(IDM_VIDEOWINDOW, true);
|
ToggleDLLWindow(IDM_VIDEOWINDOW, true);
|
||||||
}
|
}
|
||||||
|
@ -515,22 +515,23 @@ void CCodeWindow::ToggleJitWindow(bool bShow)
|
||||||
|
|
||||||
void CCodeWindow::ToggleSoundWindow(bool bShow)
|
void CCodeWindow::ToggleSoundWindow(bool bShow)
|
||||||
{
|
{
|
||||||
|
// TODO: Resurrect DSP debugger window.
|
||||||
|
#if 0
|
||||||
GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow);
|
GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow);
|
||||||
if (bShow)
|
if (bShow)
|
||||||
{
|
{
|
||||||
/* TODO: Resurrect DSP debugger window.
|
if (!m_SoundWindow)
|
||||||
if (!m_JitWindow)
|
m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUNDWINDOW);
|
||||||
m_JitWindow = new CJitWindow(Parent, IDM_SOUNDWINDOW);
|
Parent->DoAddPage(m_SoundWindow,
|
||||||
Parent->DoAddPage(m_JitWindow,
|
|
||||||
iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW],
|
iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW],
|
||||||
Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]);
|
Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]);
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
else // Close
|
else // Close
|
||||||
{
|
{
|
||||||
//Parent->DoRemovePage(m_JitWindow, false);
|
Parent->DoRemovePage(m_SoundWindow, false);
|
||||||
// m_JitWindow = NULL;
|
m_SoundWindow = NULL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notice: This windows docking will produce several wx debugging messages for plugin
|
// Notice: This windows docking will produce several wx debugging messages for plugin
|
||||||
|
|
|
@ -216,7 +216,7 @@ void CFrame::ClosePages()
|
||||||
g_pCodeWindow->ToggleBreakPointWindow(false);
|
g_pCodeWindow->ToggleBreakPointWindow(false);
|
||||||
g_pCodeWindow->ToggleMemoryWindow(false);
|
g_pCodeWindow->ToggleMemoryWindow(false);
|
||||||
g_pCodeWindow->ToggleJitWindow(false);
|
g_pCodeWindow->ToggleJitWindow(false);
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_SOUNDWINDOW, false);
|
g_pCodeWindow->ToggleSoundWindow(false);
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -257,7 +257,7 @@ void CFrame::OnNotebookPageClose(wxAuiNotebookEvent& event)
|
||||||
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_MEMORYWINDOW)
|
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_MEMORYWINDOW)
|
||||||
g_pCodeWindow->ToggleMemoryWindow(false);
|
g_pCodeWindow->ToggleMemoryWindow(false);
|
||||||
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_SOUNDWINDOW)
|
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_SOUNDWINDOW)
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_SOUNDWINDOW, false);
|
g_pCodeWindow->ToggleSoundWindow(false);
|
||||||
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_VIDEOWINDOW)
|
if (Ctrl->GetPage(event.GetSelection())->GetId() == IDM_VIDEOWINDOW)
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -939,13 +939,10 @@ void CFrame::DoStop()
|
||||||
if(Frame::IsPlayingInput() || Frame::IsRecordingInput())
|
if(Frame::IsPlayingInput() || Frame::IsRecordingInput())
|
||||||
Frame::EndPlayInput();
|
Frame::EndPlayInput();
|
||||||
|
|
||||||
// These windows cause segmentation faults if they are open when the emulator
|
// The video debugger window causes a segmentation fault if open when the
|
||||||
// stops. It has something to do with the the wxAuiManager update.
|
// emulator stops. It has something to do with the the wxAuiManager update.
|
||||||
if (g_pCodeWindow)
|
if (g_pCodeWindow)
|
||||||
{
|
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_SOUNDWINDOW, false);
|
|
||||||
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
g_pCodeWindow->ToggleDLLWindow(IDM_VIDEOWINDOW, false);
|
||||||
}
|
|
||||||
|
|
||||||
BootManager::Stop();
|
BootManager::Stop();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue