diff --git a/.gitmodules b/.gitmodules index b1269e1..d190ff8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,84 +1,105 @@ [submodule "libs/glm"] path = libs/glm url = https://github.com/g-truc/glm.git - branch = master + branch = master + update = merge [submodule "libs/stb/stb"] path = libs/stb/stb url = https://github.com/nothings/stb.git - branch = master + branch = master + update = merge [submodule "libs/yoga"] path = libs/yoga url = https://github.com/facebook/yoga.git - branch = master + branch = master + update = merge [submodule "libs/tinyxml2"] path = libs/tinyxml2 url = https://github.com/leethomason/tinyxml2.git - branch = master + branch = master + update = merge [submodule "libs/curl-android-ios"] path = libs/curl-android-ios url = https://bitbucket.org/omigamedev/curl-android-ios.git - branch = master + branch = master + update = merge [submodule "libs/poly2tri"] path = libs/poly2tri url = https://github.com/greenm01/poly2tri - branch = master + branch = master + update = merge [submodule "libs/base64"] path = libs/base64 url = https://github.com/tkislan/base64 - branch = master + branch = master + update = merge [submodule "libs/bugtrap-client"] path = libs/bugtrap-client url = https://bitbucket.org/omigamedev/bugtrap-client-x64.git - branch = master + branch = master + update = merge [submodule "libs/curl-win"] path = libs/curl-win url = https://bitbucket.org/omigamedev/curl-win64.git - branch = master + branch = master + update = merge [submodule "libs/sqlite3"] path = libs/sqlite3 url = https://bitbucket.org/omigamedev/sqlite3.git - branch = master + branch = master + update = merge [submodule "libs/openvr"] path = libs/openvr url = https://github.com/ValveSoftware/openvr.git - branch = master + branch = master + update = merge [submodule "libs/nanort"] path = libs/nanort url = https://github.com/lighttransport/nanort.git - branch = master + branch = master + update = merge [submodule "libs/hash-library"] path = libs/hash-library url = https://github.com/stbrumme/hash-library - branch = master + branch = master + update = merge [submodule "libs/native_app_glue"] path = libs/native_app_glue url = https://bitbucket.org/omigamedev/native_app_glue.git - branch = master + branch = master + update = merge [submodule "libs/fmt"] path = libs/fmt url = https://github.com/fmtlib/fmt.git - branch = master + branch = master + update = merge [submodule "libs/ovr_mobile"] path = libs/ovr_mobile url = https://bitbucket.org/omigamedev/ovr_mobile.git - branch = master + branch = master + update = merge [submodule "libs/ovr_platform"] path = libs/ovr_platform url = https://bitbucket.org/omigamedev/ovr_platform.git - branch = master + branch = master + update = merge [submodule "libs/glad"] path = libs/glad url = https://bitbucket.org/omigamedev/glad.git - branch = master + branch = master + update = merge [submodule "libs/wave_sdk"] path = libs/wave_sdk url = https://bitbucket.org/omigamedev/wave_sdk.git - branch = master + branch = master + update = merge [submodule "libs/appcenter-apple"] path = libs/appcenter-apple url = https://bitbucket.org/omigamedev/appcenter-apple.git - branch = master + branch = master + update = merge [submodule "libs/tinyfiledialogs"] path = libs/tinyfiledialogs url = https://git.code.sf.net/p/tinyfiledialogs/code branch = master + update = merge diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj index 383aa3f..c2ee88a 100644 --- a/PanoPainter.vcxproj +++ b/PanoPainter.vcxproj @@ -197,6 +197,30 @@ NotUsing NotUsing + + NotUsing + NotUsing + NotUsing + NotUsing + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + + + NotUsing + NotUsing + NotUsing + NotUsing + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + $(IntDir)yoga\ + NotUsing NotUsing @@ -247,16 +271,6 @@ $(IntDir)yoga\ $(IntDir)yoga\ - - NotUsing - NotUsing - $(IntDir)yoga\ - $(IntDir)yoga\ - $(IntDir)yoga\ - $(IntDir)yoga\ - $(IntDir)yoga\ - $(IntDir)yoga\ - NotUsing NotUsing diff --git a/PanoPainter.vcxproj.filters b/PanoPainter.vcxproj.filters index 819ee1d..4a7d568 100644 --- a/PanoPainter.vcxproj.filters +++ b/PanoPainter.vcxproj.filters @@ -324,9 +324,6 @@ libs\yoga - - libs\yoga - libs\yoga @@ -378,6 +375,12 @@ Source Files\ui + + libs\yoga + + + libs\yoga + diff --git a/libs/fmt b/libs/fmt index 9a0a24f..b7a1574 160000 --- a/libs/fmt +++ b/libs/fmt @@ -1 +1 @@ -Subproject commit 9a0a24f90bdbc91c8b84a061e24195127f0addbf +Subproject commit b7a157401e54895b491d0189045f27ca5cf100f6 diff --git a/libs/glm b/libs/glm index 47031aa..ea678fa 160000 --- a/libs/glm +++ b/libs/glm @@ -1 +1 @@ -Subproject commit 47031aa4b7b079716e4cac496819e7f464b6a713 +Subproject commit ea678faff9340ae4a79f50f2edd947141405e128 diff --git a/libs/nanort b/libs/nanort index 44a4290..5fb786b 160000 --- a/libs/nanort +++ b/libs/nanort @@ -1 +1 @@ -Subproject commit 44a429067cab38617f0a716ffb80cc4e09547c49 +Subproject commit 5fb786baab85bbf0c8bbecb6213bea1ea5e219ab diff --git a/libs/openvr b/libs/openvr index d9cffe2..5aa6c5f 160000 --- a/libs/openvr +++ b/libs/openvr @@ -1 +1 @@ -Subproject commit d9cffe2ff87bf0bac69b56bcf6fb60652a9d4009 +Subproject commit 5aa6c5f0f6520c59c4dce124541ecc62604fd7a5 diff --git a/libs/stb/stb b/libs/stb/stb index e6afb9c..f67165c 160000 --- a/libs/stb/stb +++ b/libs/stb/stb @@ -1 +1 @@ -Subproject commit e6afb9cbae4064da8c3e69af3ff5c4629579c1d2 +Subproject commit f67165c2bb2af3060ecae7d20d6f731173485ad0 diff --git a/libs/tinyfiledialogs b/libs/tinyfiledialogs index 331f93e..b54143e 160000 --- a/libs/tinyfiledialogs +++ b/libs/tinyfiledialogs @@ -1 +1 @@ -Subproject commit 331f93e903e0555399bf81479114dda978a77d7c +Subproject commit b54143ebcdd533a3e91fe47a681651b6723b5fe2 diff --git a/libs/tinyxml2 b/libs/tinyxml2 index 8f4a9a8..ff61650 160000 --- a/libs/tinyxml2 +++ b/libs/tinyxml2 @@ -1 +1 @@ -Subproject commit 8f4a9a8cc2a93709b97d0cf51d33ddd1ec33277d +Subproject commit ff61650517cc32d524689366f977716e73d4f924 diff --git a/libs/yoga b/libs/yoga index 7fc6fcb..fb07dcf 160000 --- a/libs/yoga +++ b/libs/yoga @@ -1 +1 @@ -Subproject commit 7fc6fcb38cf44e556b882b1700be699abbb56a36 +Subproject commit fb07dcff40a288658e24e3190e6c1929f25ec183