Update submodules, buildfix before merging the rest of the dualhead support pull requeset

This commit is contained in:
Henrik Rydgård 2014-10-15 23:01:35 +02:00
parent 0052fa5b68
commit 9e8a448914
4 changed files with 4 additions and 4 deletions

View File

@ -246,7 +246,7 @@ void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, boo
}
void NativeInit(int argc, const char *argv[],
const char *savegame_directory, const char *external_directory, const char *installID) {
const char *savegame_directory, const char *external_directory, const char *installID, bool fs) {
#ifdef ANDROID_NDK_PROFILER
setenv("CPUPROFILE_FREQUENCY", "500", 1);
setenv("CPUPROFILE", "/sdcard/gmon.out", 1);

View File

@ -110,7 +110,7 @@ unsigned int WINAPI TheThread(void *)
args.push_back(string.c_str());
}
NativeInit(static_cast<int>(args.size()), &args[0], "1234", "1234", "1234");
NativeInit(static_cast<int>(args.size()), &args[0], "1234", "1234", "1234", fs);
Host *nativeHost = host;
host = oldHost;

2
lang

@ -1 +1 @@
Subproject commit 9b046817012c0bdaa2df204dbfd2f7d2ea01f41b
Subproject commit 0644f2d429ad2c3af2a80bed90bd1fe9d8240c37

2
native

@ -1 +1 @@
Subproject commit d3743d0f39554d68f1bb585e2b51892e2adbbdba
Subproject commit faca4e72ecd1f27531d635cf29420498cca36574