Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mac buildfix

Browse Source
This commit is contained in:
Henrik Rydgård 2014-08-23 14:24:24 +02:00
parent 2eafb096d8
commit dae07e9f28
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -276,9 +276,12 @@ if(ARM)
Common/ArmEmitter.cpp
Common/ArmThunk.cpp)
elseif(X86)
# ARMEmitter is here for the unit tests and don't really hurt otherwise.
set(CommonExtra ${CommonExtra}
Common/ABI.cpp
Common/ABI.h
Common/ArmEmitter.h
Common/ArmEmitter.cpp
Common/CPUDetect.cpp
Common/CPUDetect.h
Common/Thunk.cpp
@ -747,11 +750,11 @@ else()
endif()
set(NativeAppSource
android/jni/TestRunner.cpp
UI/NativeApp.cpp
UI/BackgroundAudio.cpp
UI/DevScreens.cpp
UI/EmuScreen.cpp
android/jni/TestRunner.cpp
UI/GameInfoCache.cpp
UI/MainScreen.cpp
UI/MiscScreens.cpp

7
UI/MiscScreens.cpp
View File

@ -15,16 +15,19 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <algorithm>
#include "base/functional.h"
#include "base/colorutil.h"
#include "base/timeutil.h"
#include "gfx_es2/draw_buffer.h"
#include "file/vfs.h"
#include "math/curves.h"
#include "i18n/i18n.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "ui/ui.h"
#include "file/vfs.h"
#include "UI/MiscScreens.h"
#include "UI/EmuScreen.h"
#include "UI/MainScreen.h"
@ -159,7 +162,7 @@ void UIScreenWithBackground::sendMessage(const char *message, const char *value)
I18NCategory *de = GetI18NCategory("Developer");
if (!strcmp(message, "language screen")) {
auto langScreen = new NewLanguageScreen(de->T("Language"));
langScreen->OnChoice.Handle(this, &UIScreenWithBackground::OnLanguageChange);
// langScreen->OnChoice.Handle(this, &UIScreenWithBackground::OnLanguageChange);
screenManager()->push(langScreen);
}
}

2
UI/MiscScreens.h
View File

@ -21,8 +21,8 @@
#include <map>
#include <string>
#include "base/functional.h"
#include "file/file_util.h"
#include "base/functional.h"
#include "ui/ui_screen.h"
#include "GPU/Common/PostShader.h"

2
UI/NativeApp.cpp
View File

@ -913,7 +913,7 @@ void NativeResized() {
#if defined(__APPLE__) && !defined(USING_QT_UI)
static int dp_xres_old=dp_xres;
if (dp_xres != dp_xres_old) {
uiTexture->Load("ui_atlas.zim");
// uiTexture->Load("ui_atlas.zim");
dp_xres_old = dp_xres;
}
#endif

2
lang

@ -1 +1 @@
Subproject commit fdc4558a98fe039dfa2028a2cd53edfdc0805054
Subproject commit 0a1cd8714cbcdaa21673913b734aad26862624f5