Skip to content

Commit 272c970

Browse files
committed
Adding AndroidSDK/NDK auto installer. Found a bug in dub
Former-commit-id: 123d59c Former-commit-id: 5f22ad26483345c42df932b43fc76477b5b10126 [formerly e61d990] Former-commit-id: 2df830e4c4108850bf9cbf860176eb072c0b6de8
1 parent 641c30c commit 272c970

File tree

14 files changed

+504
-344
lines changed

14 files changed

+504
-344
lines changed

dub.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,16 +399,14 @@
399399
"build/release_game"
400400
],
401401
"dependencies": {
402-
"jni": {"path": "./modules/jni", "version": "*"},
403-
"sles": {"path": "./dependencies/sles", "version": "*"},
404-
"gles" : {"path": "./dependencies/gles", "version": "*"}
402+
"jni": {"path": "./modules/jni", "version": "*"}
405403
},
406404
"subConfigurations": {
407405
"audio": "android",
408406
"console": "android",
409407
"renderer": "android"
410408
},
411-
"postBuildCommands": [
409+
"postBuildCommands-windows": [
412410
"copy /B .\\bin\\android\\libhipreme_engine.so .\\build\\android\\project\\app\\src\\main\\jniLibs\\arm64-v8a\\libhipreme_engine.so",
413411
"cd .\\tools\\build && rdmd copyresources.d .\\release_game\\assets .\\android\\project\\app\\src\\main\\assets",
414412
"REM .\\build\\android\\project\\ && .\\gradlew.bat :app:assembleDebug && adb install -r .\\app\\build\\outputs\\apk\\debug\\app-debug.apk",

modules/audio/dub.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
],
1010
"copyright": "Copyright © 2021, Hipreme",
1111
"dependencies": {
12-
"math": {"path": "../math"},
13-
"error": {"path": "../error"},
14-
"audio_decoding": {"path": "../audio_decoding"}
12+
"math": {"path": "../math", "version": "*"},
13+
"error": {"path": "../error", "version": "*"},
14+
"audio_decoding": {"path": "../audio_decoding", "version": "*"}
1515
},
1616
"configurations": [
1717
{
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"name": "android",
67-
"dependencies": {"sles": {"path": "../../dependencies/sles"}},
67+
"dependencies": {"sles": {"path": "../../dependencies/sles", "version": "*"}},
6868
"subConfigurations": {
6969
"audio_decoding": "audioformats"
7070
},

modules/console/dub.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"name": "android",
2222
"dependencies": {
23-
"jni" : {"path": "../jni", "optional": true}
23+
"jni" : {"path": "../jni", "version": "*"}
2424
}
2525
},
2626
{

modules/jni/dub.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"dependencies":
1111
{
12-
"util" : {"path" : "../util"}
12+
"util" : {"path" : "../util", "version": "*"}
1313
},
1414
"copyright": "Copyright © 2021, Hipreme",
1515
"description": "HipremeEngine JNI module",

modules/renderer/dub.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
{
8787
"name": "android",
8888
"dependencies": {
89-
"gles" : {"path": "../../dependencies/gles"},
90-
"bind" : {"path": "../bind", "optional": true}
89+
"gles" : {"path": "../../dependencies/gles", "version": "*"},
90+
"bind" : {"path": "../bind", "version": "*", "optional": true}
9191
},
9292
"subConfigurations": {
9393
"bind": "android",

modules/util/dub.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
"-H",
2121
"-Hd=./import"
2222
]
23-
},
24-
{
25-
"name": "source",
26-
"targetType": "sourceLibrary"
2723
}
2824
],
2925
"description": "HipremeEngine data module",

tools/user/build_selector/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ build_selector.dll
1111
build_selector.a
1212
build_selector.lib
1313
build_selector-test-*
14+
androidSdk
1415
*.exe
1516
*.pdb
1617
*.o

tools/user/build_selector/dub.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"stringImportPaths": [
1010
"../../build/scripts"
1111
],
12+
"libs": ["curl"],
1213
"description": "A minimal D application.",
1314
"license": "proprietary",
1415
"name": "build_selector"

0 commit comments

Comments
 (0)