Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 15:30:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3168 from xyzz/linux_qt_build_fixes

Browse Source 
Fix Qt build on Linux.
This commit is contained in:
Henrik Rydgård 2013-08-14 12:09:10 -07:00
commit 67ff572ba8
5 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Qt/PPSSPP.pro
View File

@ -26,7 +26,7 @@ win32 {
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32
} }
linux { linux {
LIBS += -L. -lCore -lCommon -lNative -ldl LIBS += -L. -lCore -lCommon -lNative -ldl -lz
PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
!mobile_platform { !mobile_platform {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig

2
Qt/debugger_displaylist.cpp
View File

@ -1486,7 +1486,7 @@ void Debugger_DisplayList::UpdateRenderBufferGUI()
{ {
EmuThread_LockDraw(true); EmuThread_LockDraw(true);
gpu->Flush(); //gpu->Flush();
int FRAME_WIDTH; int FRAME_WIDTH;
int FRAME_HEIGHT; int FRAME_HEIGHT;

7
Qt/mainwindow.cpp
View File

@ -154,7 +154,6 @@ void MainWindow::UpdateMenus()
ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay); ui->action_Stretch_to_display->setChecked(g_Config.bStretchToDisplay);
ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform); ui->action_OptionsHardwareTransform->setChecked(g_Config.bHardwareTransform);
ui->action_OptionsUseVBO->setChecked(g_Config.bUseVBO);
ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache); ui->action_OptionsVertexCache->setChecked(g_Config.bVertexCache);
ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0); ui->actionFrameskip->setChecked(g_Config.iFrameSkip != 0);
@ -547,12 +546,6 @@ void MainWindow::on_action_OptionsHardwareTransform_triggered()
UpdateMenus(); UpdateMenus();
} }
void MainWindow::on_action_OptionsUseVBO_triggered()
{
g_Config.bUseVBO = !g_Config.bUseVBO;
UpdateMenus();
}
void MainWindow::on_action_OptionsVertexCache_triggered() void MainWindow::on_action_OptionsVertexCache_triggered()
{ {
g_Config.bVertexCache = !g_Config.bVertexCache; g_Config.bVertexCache = !g_Config.bVertexCache;

1
Qt/mainwindow.h
View File

@ -100,7 +100,6 @@ private slots:
void on_action_Stretch_to_display_triggered(); void on_action_Stretch_to_display_triggered();
void on_action_OptionsHardwareTransform_triggered(); void on_action_OptionsHardwareTransform_triggered();
void on_action_OptionsUseVBO_triggered();
void on_action_OptionsVertexCache_triggered(); void on_action_OptionsVertexCache_triggered();
void on_actionFrameskip_triggered(); void on_actionFrameskip_triggered();

9
Qt/mainwindow.ui
View File

@ -174,7 +174,6 @@
<addaction name="action_Stretch_to_display"/> <addaction name="action_Stretch_to_display"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_OptionsHardwareTransform"/> <addaction name="action_OptionsHardwareTransform"/>
<addaction name="action_OptionsUseVBO"/>
<addaction name="action_OptionsVertexCache"/> <addaction name="action_OptionsVertexCache"/>
<addaction name="action_OptionsDisplayRawFramebuffer"/> <addaction name="action_OptionsDisplayRawFramebuffer"/>
<addaction name="actionFrameskip"/> <addaction name="actionFrameskip"/>
@ -479,14 +478,6 @@
<string>&amp;About PPSSPP...</string> <string>&amp;About PPSSPP...</string>
</property> </property>
</action> </action>
<action name="action_OptionsUseVBO">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Use VBO</string>
</property>
</action>
<action name="actionLogG3DDebug"> <action name="actionLogG3DDebug">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>