Build fix Blackberry and Linux Qt.

siuying · Aug 23, 2013 · cfbc64f · cfbc64f
1 parent d1f816f
commit cfbc64f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Blackberry/bar-descriptor.xml b/Blackberry/bar-descriptor.xml
@@ -3,7 +3,7 @@
     <id>com.Qtness.PPSSPP</id>
     <name>PPSSPP</name>
     <filename>PPSSPPBlackberry</filename>
-    <versionNumber>0.9</versionNumber>
+    <versionNumber>0.9.1</versionNumber>
     <buildId>1</buildId>
     <description>Playstation portable emulator.</description>
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1002,7 +1002,6 @@ add_library(GPU OBJECT
 	GPU/GLES/ShaderManager.cpp
 	GPU/GLES/ShaderManager.h
 	GPU/GLES/Spline.cpp
-	GPU/GLES/Spline.h
 	GPU/GLES/StateMapping.cpp
 	GPU/GLES/StateMapping.h
 	GPU/GLES/TextureCache.cpp

diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp
@@ -11,11 +11,14 @@
 #include "base/NativeApp.h"
 #include "UI/EmuScreen.h"
 #include "UI/UIShader.h"
+#include "UI/GameInfoCache.h"
+#include "UI/PluginScreen.h"
+#include "UI/OnScreenDisplay.h"
 #include "UI/ui_atlas.h"
+#include "ui/ui.h"
 #include "ui/ui_context.h"
 #include "GPU/ge_constants.h"
 #include "EmuThread.h"
-#include "UI/GameInfoCache.h"
 
 const char *stateToLoad = NULL;
 
@@ -349,8 +352,8 @@ void NativeInitGraphics()
 	theme.uiFont = UBUNTU24;
 	theme.uiFontSmall = UBUNTU24;
 	theme.uiFontSmaller = UBUNTU24;
-	theme.buttonImage = I_BUTTON;
-	theme.buttonSelected = I_BUTTON_SELECTED;
+	theme.buttonImage = I_SOLIDWHITE;  // not using classic buttons
+	theme.buttonSelected = I_SOLIDWHITE;
 	theme.checkOn = I_CHECKEDBOX;
 	theme.checkOff = I_SQUARE;