diff --git a/doomsday/build/scripts/packres.py b/doomsday/build/scripts/packres.py index 76f5d7c008..11c8197b11 100755 --- a/doomsday/build/scripts/packres.py +++ b/doomsday/build/scripts/packres.py @@ -71,16 +71,6 @@ def process_dir(path, dest_path): [ ('client/data', 'data') ] ) p.create('doomsday.pk3') -# net.dengine.base.pack -p = Pack() -p.add_files( [ ('net.dengine.base.pack', '') ] ) -p.create('net.dengine.base.pack') - -# net.dengine.client.pack -p = Pack() -p.add_files( [ ('client/net.dengine.client.pack', '') ] ) -p.create('net.dengine.client.pack') - # libdoom.pk3 p = Pack() p.add_files( diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index 1235ce653e..8157b8eea6 100644 --- a/doomsday/client/client.pro +++ b/doomsday/client/client.pro @@ -784,6 +784,8 @@ OTHER_FILES += \ # Resources ------------------------------------------------------------------ +buildPackage(net.dengine.client, $$OUT_PWD/..) + data.files = $$OUT_PWD/../doomsday.pk3 # These fonts may be needed during the initial startup busy mode. diff --git a/doomsday/config.pri b/doomsday/config.pri index c612b230e0..cee408c795 100644 --- a/doomsday/config.pri +++ b/doomsday/config.pri @@ -131,9 +131,6 @@ else:macx: include(config_macx.pri) # Apply deng_* Configuration ------------------------------------------------- -# Location for deploying packages. -!deng_sdk: builtpacks.path = $$DENG_DATA_DIR - deng_nofixedasm { DEFINES += DENG_NO_FIXED_ASM } diff --git a/doomsday/libcore/libcore.pro b/doomsday/libcore/libcore.pro index ff3806e98c..191feb2a73 100644 --- a/doomsday/libcore/libcore.pro +++ b/doomsday/libcore/libcore.pro @@ -197,7 +197,7 @@ macx { doPostLink("cp -fRp libdeng_core*dylib ../client/Doomsday.app/Contents/Frameworks") } -buildPackage(net.dengine.stdlib, $$OUT_PWD) +buildPackage(net.dengine.stdlib, $$OUT_PWD/..) deployLibrary() deng_sdk { diff --git a/doomsday/libdoomsday/libdoomsday.pro b/doomsday/libdoomsday/libdoomsday.pro index 71fb642124..c45f4d7b47 100644 --- a/doomsday/libdoomsday/libdoomsday.pro +++ b/doomsday/libdoomsday/libdoomsday.pro @@ -139,6 +139,10 @@ SOURCES += \ win32: SOURCES += \ src/filesys/fs_windows.cpp +# Resources ------------------------------------------------------------------ + +buildPackage(../net.dengine.base, $$OUT_PWD/..) + # Installation --------------------------------------------------------------- macx { diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro index c42cd57e20..21f0001689 100644 --- a/doomsday/libgui/libgui.pro +++ b/doomsday/libgui/libgui.pro @@ -231,5 +231,5 @@ macx { linkBinaryToBundledAssimp(libdeng_gui.1.dylib, ..) } -buildPackage(net.dengine.stdlib.gui, $$OUT_PWD) +buildPackage(net.dengine.stdlib.gui, $$OUT_PWD/..) deployLibrary() diff --git a/doomsday/macros.pri b/doomsday/macros.pri index 19abb2930f..3503da21e8 100644 --- a/doomsday/macros.pri +++ b/doomsday/macros.pri @@ -108,7 +108,6 @@ defineTest(deployLibrary) { target.path = $$DENG_SDK_LIB_DIR export(target.path) } - !macx: INSTALLS *= builtpacks export(INSTALLS) }