mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge branch 'master' into TemporaryHackishBranch
# Conflicts: # Core/Config.cpp # Core/Config.h # UI/ControlMappingScreen.cpp # UI/EmuScreen.cpp # UI/GameSettingsScreen.cpp # android/assets/ui_atlas.meta # android/assets/ui_atlas.zim # assets/ui_atlas.meta # assets/ui_atlas.zim
This commit is contained in:
commit
4fb6e0c242
198 files changed
+6323
-2862
No files matched your search
@@ -14,11 +14,13 @@
|
||||
#include "Common/System/NativeApp.h"
|
||||
#include "Common/System/System.h"
|
||||
|
||||
#include "Common/CPUDetect.h"
|
||||
#include "Common/File/VFS/VFS.h"
|
||||
#include "Common/File/VFS/AssetReader.h"
|
||||
#include "Common/File/FileUtil.h"
|
||||
#include "Common/GraphicsContext.h"
|
||||
#include "Common/TimeUtil.h"
|
||||
#include "Common/Thread/ThreadManager.h"
|
||||
#include "Core/Config.h"
|
||||
#include "Core/ConfigValues.h"
|
||||
#include "Core/Core.h"
|
||||
@@ -330,6 +332,8 @@ int main(int argc, const char* argv[])
|
||||
if (testFilenames.empty())
|
||||
return printUsage(argv[0], argc <= 1 ? NULL : "No executables specified");
|
||||
|
||||
g_threadManager.Init(cpu_info.num_cores, cpu_info.logical_cpu_count);
|
||||
|
||||
LogManager::Init(&g_Config.bEnableLogging);
|
||||
LogManager *logman = LogManager::GetInstance();
|
||||
|
||||
@@ -388,7 +392,6 @@ int main(int argc, const char* argv[])
|
||||
g_Config.iInternalResolution = 1;
|
||||
g_Config.iUnthrottleMode = (int)UnthrottleMode::CONTINUOUS;
|
||||
g_Config.bEnableLogging = fullLog;
|
||||
g_Config.iNumWorkerThreads = 1;
|
||||
g_Config.bSoftwareSkinning = true;
|
||||
g_Config.iATRACMP3Volume = MAX_CONFIG_VOLUME;
|
||||
g_Config.iSASVolume = MAX_CONFIG_VOLUME;
|
||||
|
||||
Reference in new issue
Block a user