From 9dbe24adbb4784c6b1ebb812c506bc5eb5179bd9 Mon Sep 17 00:00:00 2001 From: Aruki Date: Tue, 18 Dec 2018 17:11:32 -0700 Subject: [PATCH] Fixed lzo and nod submodules --- .gitmodules | 5 ++++- externals/lzo | 1 + externals/nod | 2 +- src/Core/Core.pro | 8 ++++---- src/Editor/Editor.pro | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) create mode 160000 externals/lzo diff --git a/.gitmodules b/.gitmodules index 10d96edb..9b6242fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,10 +9,13 @@ url = https://github.com/assimp/assimp [submodule "externals/nod"] path = externals/nod - url = https://github.com/arukibree/nod + url=https://gitlab.axiodl.com/AxioDL/nod [submodule "externals/CodeGen"] path = externals/CodeGen url = https://github.com/arukibree/CodeGen [submodule "externals/LibCommon"] path = externals/LibCommon url = https://github.com/arukibree/LibCommon +[submodule "externals/lzo"] + path = externals/lzo + url = https://github.com/nemequ/lzo \ No newline at end of file diff --git a/externals/lzo b/externals/lzo new file mode 160000 index 00000000..0083878c --- /dev/null +++ b/externals/lzo @@ -0,0 +1 @@ +Subproject commit 0083878c235a89ef96a009d1ff0b500f3a364e4b diff --git a/externals/nod b/externals/nod index 6f777ebb..be840968 160000 --- a/externals/nod +++ b/externals/nod @@ -1 +1 @@ -Subproject commit 6f777ebb481f58a4e05d7323176335b450ea8d42 +Subproject commit be8409681fd5e921be72a04f460e87f2de5f6280 diff --git a/src/Core/Core.pro b/src/Core/Core.pro index fb72c1b8..a558ff33 100644 --- a/src/Core/Core.pro +++ b/src/Core/Core.pro @@ -67,7 +67,7 @@ INCLUDEPATH += $$PWE_MAIN_INCLUDE \ $$EXTERNALS_DIR/CodeGen/include \ $$EXTERNALS_DIR/glew-2.1.0/include \ $$EXTERNALS_DIR/LibCommon/Source \ - $$EXTERNALS_DIR/lzo-2.10/include \ + $$EXTERNALS_DIR/lzo/include \ $$EXTERNALS_DIR/nod/include \ $$EXTERNALS_DIR/nod/logvisor/include \ $$EXTERNALS_DIR/tinyxml2 \ @@ -367,6 +367,6 @@ CODEGEN_SRC_PATH = $$PWD include($$EXTERNALS_DIR/CodeGen/codegen.pri) # Library Sources -SOURCES += $$EXTERNALS_DIR/lzo-2.10/src/lzo_init.c \ - $$EXTERNALS_DIR/lzo-2.10/src/lzo1x_9x.c \ - $$EXTERNALS_DIR/lzo-2.10/src/lzo1x_d1.c +SOURCES += $$EXTERNALS_DIR/lzo/src/lzo_init.c \ + $$EXTERNALS_DIR/lzo/src/lzo1x_9x.c \ + $$EXTERNALS_DIR/lzo/src/lzo1x_d1.c diff --git a/src/Editor/Editor.pro b/src/Editor/Editor.pro index 0aa28452..660d5f6a 100644 --- a/src/Editor/Editor.pro +++ b/src/Editor/Editor.pro @@ -79,7 +79,7 @@ INCLUDEPATH += $$PWE_MAIN_INCLUDE \ $$EXTERNALS_DIR/CodeGen/include \ $$EXTERNALS_DIR/glew-2.1.0/include \ $$EXTERNALS_DIR/LibCommon/Source \ - $$EXTERNALS_DIR/lzo-2.10/include \ + $$EXTERNALS_DIR/lzo/include \ $$EXTERNALS_DIR/nod/include \ $$EXTERNALS_DIR/nod/logvisor/include \ $$EXTERNALS_DIR/tinyxml2 \