diff --git a/.gitmodules b/.gitmodules index 961850a67..ea1822e55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,4 +15,19 @@ url = git://github.com/DFHack/clsocket.git [submodule "scripts/3rdparty/lethosor"] path = scripts/3rdparty/lethosor - url = https://github.com/DFHack/lethosor-scripts + url = git://github.com/DFHack/lethosor-scripts +[submodule "scripts/3rdparty/roses"] + path = scripts/3rdparty/roses + url = git://github.com/DFHack/roses-scripts.git +[submodule "scripts/3rdparty/maxthyme"] + path = scripts/3rdparty/maxthyme + url = git://github.com/DFHack/maxthyme-scripts.git +[submodule "scripts/3rdparty/dscorbett"] + path = scripts/3rdparty/dscorbett + url = git://github.com/DFHack/dscorbett-scripts.git +[submodule "scripts/3rdparty/kane-t"] + path = scripts/3rdparty/kane-t + url = git://github.com/DFHack/kane-t-scripts.git +[submodule "scripts/3rdparty/maienm"] + path = scripts/3rdparty/maienm + url = git://github.com/DFHack/maienm-scripts.git diff --git a/dfhack.init-example b/dfhack.init-example index cc4d67775..a91590eea 100644 --- a/dfhack.init-example +++ b/dfhack.init-example @@ -241,6 +241,10 @@ log-region # add information to item viewscreens view-item-info enable +gui/load-screen enable + +base/roses-init --all + ####################################################### # Apply binary patches at runtime # ####################################################### diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e653555f9..1a42718cf 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -372,12 +372,12 @@ install(DIRECTORY lua/ DESTINATION ${DFHACK_LUA_DESTINATION} FILES_MATCHING PATTERN "*.lua") -install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts - DESTINATION ${DFHACK_DATA_DESTINATION} - FILES_MATCHING PATTERN "*.lua" - PATTERN "*.rb" - PATTERN "3rdparty" EXCLUDE - ) +#install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts +# DESTINATION ${DFHACK_DATA_DESTINATION} +# FILES_MATCHING PATTERN "*.lua" +# PATTERN "*.rb" +# PATTERN "3rdparty" EXCLUDE +# ) install(DIRECTORY ${dfhack_SOURCE_DIR}/patches DESTINATION ${DFHACK_DATA_DESTINATION} diff --git a/scripts/3rdparty/dscorbett b/scripts/3rdparty/dscorbett new file mode 160000 index 000000000..544f890a6 --- /dev/null +++ b/scripts/3rdparty/dscorbett @@ -0,0 +1 @@ +Subproject commit 544f890a62622e2c6188991afe61fdf3c0513227 diff --git a/scripts/3rdparty/kane-t b/scripts/3rdparty/kane-t new file mode 160000 index 000000000..462d68598 --- /dev/null +++ b/scripts/3rdparty/kane-t @@ -0,0 +1 @@ +Subproject commit 462d68598a0ddbaca710e07013efbaabe464a695 diff --git a/scripts/3rdparty/lethosor b/scripts/3rdparty/lethosor index ceed207e3..e3666a738 160000 --- a/scripts/3rdparty/lethosor +++ b/scripts/3rdparty/lethosor @@ -1 +1 @@ -Subproject commit ceed207e38220e21067a91b8d6f7b9680a476f69 +Subproject commit e3666a7385ca00565b95f3d7c6d41f6e7955816f diff --git a/scripts/3rdparty/maienm b/scripts/3rdparty/maienm new file mode 160000 index 000000000..8cffa1266 --- /dev/null +++ b/scripts/3rdparty/maienm @@ -0,0 +1 @@ +Subproject commit 8cffa1266d8903b568cf48366dd6f57095e3ae97 diff --git a/scripts/3rdparty/maxthyme b/scripts/3rdparty/maxthyme new file mode 160000 index 000000000..7781264a2 --- /dev/null +++ b/scripts/3rdparty/maxthyme @@ -0,0 +1 @@ +Subproject commit 7781264a20026c7db927255b7ce34caaacc52e54 diff --git a/scripts/3rdparty/roses b/scripts/3rdparty/roses new file mode 160000 index 000000000..ce11419ef --- /dev/null +++ b/scripts/3rdparty/roses @@ -0,0 +1 @@ +Subproject commit ce11419ef8ce026af883ce81205268eb0cc1a2b1 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index ed5cc1ffc..82edb19a9 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,2 +1,14 @@ include(Scripts.cmake) +DFHACK_3RDPARTY_SCRIPT_REPO(dscorbett) +DFHACK_3RDPARTY_SCRIPT_REPO(kane-t) DFHACK_3RDPARTY_SCRIPT_REPO(lethosor) +DFHACK_3RDPARTY_SCRIPT_REPO(maienm) +DFHACK_3RDPARTY_SCRIPT_REPO(maxthyme) +DFHACK_3RDPARTY_SCRIPT_REPO(roses) + +install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts + DESTINATION ${DFHACK_DATA_DESTINATION} + FILES_MATCHING PATTERN "*.lua" + PATTERN "*.rb" + PATTERN "3rdparty" EXCLUDE + )