Fixed lzo and nod submodules

This commit is contained in:
Aruki 2018-12-18 17:11:32 -07:00
parent e7337f7e4a
commit 9dbe24adbb
5 changed files with 11 additions and 7 deletions

5
.gitmodules vendored
View File

@ -9,10 +9,13 @@
url = https://github.com/assimp/assimp url = https://github.com/assimp/assimp
[submodule "externals/nod"] [submodule "externals/nod"]
path = externals/nod path = externals/nod
url = https://github.com/arukibree/nod url=https://gitlab.axiodl.com/AxioDL/nod
[submodule "externals/CodeGen"] [submodule "externals/CodeGen"]
path = externals/CodeGen path = externals/CodeGen
url = https://github.com/arukibree/CodeGen url = https://github.com/arukibree/CodeGen
[submodule "externals/LibCommon"] [submodule "externals/LibCommon"]
path = externals/LibCommon path = externals/LibCommon
url = https://github.com/arukibree/LibCommon url = https://github.com/arukibree/LibCommon
[submodule "externals/lzo"]
path = externals/lzo
url = https://github.com/nemequ/lzo

1
externals/lzo vendored Submodule

@ -0,0 +1 @@
Subproject commit 0083878c235a89ef96a009d1ff0b500f3a364e4b

2
externals/nod vendored

@ -1 +1 @@
Subproject commit 6f777ebb481f58a4e05d7323176335b450ea8d42 Subproject commit be8409681fd5e921be72a04f460e87f2de5f6280

View File

@ -67,7 +67,7 @@ INCLUDEPATH += $$PWE_MAIN_INCLUDE \
$$EXTERNALS_DIR/CodeGen/include \ $$EXTERNALS_DIR/CodeGen/include \
$$EXTERNALS_DIR/glew-2.1.0/include \ $$EXTERNALS_DIR/glew-2.1.0/include \
$$EXTERNALS_DIR/LibCommon/Source \ $$EXTERNALS_DIR/LibCommon/Source \
$$EXTERNALS_DIR/lzo-2.10/include \ $$EXTERNALS_DIR/lzo/include \
$$EXTERNALS_DIR/nod/include \ $$EXTERNALS_DIR/nod/include \
$$EXTERNALS_DIR/nod/logvisor/include \ $$EXTERNALS_DIR/nod/logvisor/include \
$$EXTERNALS_DIR/tinyxml2 \ $$EXTERNALS_DIR/tinyxml2 \
@ -367,6 +367,6 @@ CODEGEN_SRC_PATH = $$PWD
include($$EXTERNALS_DIR/CodeGen/codegen.pri) include($$EXTERNALS_DIR/CodeGen/codegen.pri)
# Library Sources # Library Sources
SOURCES += $$EXTERNALS_DIR/lzo-2.10/src/lzo_init.c \ SOURCES += $$EXTERNALS_DIR/lzo/src/lzo_init.c \
$$EXTERNALS_DIR/lzo-2.10/src/lzo1x_9x.c \ $$EXTERNALS_DIR/lzo/src/lzo1x_9x.c \
$$EXTERNALS_DIR/lzo-2.10/src/lzo1x_d1.c $$EXTERNALS_DIR/lzo/src/lzo1x_d1.c

View File

@ -79,7 +79,7 @@ INCLUDEPATH += $$PWE_MAIN_INCLUDE \
$$EXTERNALS_DIR/CodeGen/include \ $$EXTERNALS_DIR/CodeGen/include \
$$EXTERNALS_DIR/glew-2.1.0/include \ $$EXTERNALS_DIR/glew-2.1.0/include \
$$EXTERNALS_DIR/LibCommon/Source \ $$EXTERNALS_DIR/LibCommon/Source \
$$EXTERNALS_DIR/lzo-2.10/include \ $$EXTERNALS_DIR/lzo/include \
$$EXTERNALS_DIR/nod/include \ $$EXTERNALS_DIR/nod/include \
$$EXTERNALS_DIR/nod/logvisor/include \ $$EXTERNALS_DIR/nod/logvisor/include \
$$EXTERNALS_DIR/tinyxml2 \ $$EXTERNALS_DIR/tinyxml2 \