maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2307 from MoritzBrueckner/krom-es6

Browse source 
Switch to ES6 on krom target and fix 'armory' define
This commit is contained in:
Lubos Lenco 2021-08-20 10:35:19 +02:00 committed by GitHub
parent a8a44df249 1eb087125f
commit df715db381
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
blender/arm/write_data.py
View file

@ -120,6 +120,9 @@ project.addSources('Sources');
if os.path.isdir('Subprojects/' + lib):
khafile.write('await project.addProject("Subprojects/{0}");\n'.format(lib))
if state.target.startswith('krom'):
assets.add_khafile_def('js-es=6')
if export_physics:
assets.add_khafile_def('arm_physics')
if wrd.arm_physics_engine == 'Bullet':
@ -313,15 +316,15 @@ project.addSources('Sources');
# if bpy.data.scenes[0].unit_settings.system_rotation == 'DEGREES':
# assets.add_khafile_def('arm_degrees')
# Allow libraries to recognize Armory
assets.add_khafile_def('armory')
for d in assets.khafile_defs:
khafile.write("project.addDefine('" + d + "');\n")
for p in assets.khafile_params:
khafile.write("project.addParameter('" + p + "');\n")
# Let libraries differentiate between Armory and pure Kha
assets.add_khafile_def('armory')
if state.target.startswith('android'):
bundle = 'org.armory3d.' + wrd.arm_project_package if wrd.arm_project_bundle == '' else wrd.arm_project_bundle
khafile.write("project.targetOptions.android_native.package = '{0}';\n".format(arm.utils.safestr(bundle)))