Merge pull request #2307 from MoritzBrueckner/krom-es6
Switch to ES6 on krom target and fix 'armory' define
This commit is contained in:
commit
df715db381
|
@ -120,6 +120,9 @@ project.addSources('Sources');
|
||||||
if os.path.isdir('Subprojects/' + lib):
|
if os.path.isdir('Subprojects/' + lib):
|
||||||
khafile.write('await project.addProject("Subprojects/{0}");\n'.format(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:
|
if export_physics:
|
||||||
assets.add_khafile_def('arm_physics')
|
assets.add_khafile_def('arm_physics')
|
||||||
if wrd.arm_physics_engine == 'Bullet':
|
if wrd.arm_physics_engine == 'Bullet':
|
||||||
|
@ -313,15 +316,15 @@ project.addSources('Sources');
|
||||||
# if bpy.data.scenes[0].unit_settings.system_rotation == 'DEGREES':
|
# if bpy.data.scenes[0].unit_settings.system_rotation == 'DEGREES':
|
||||||
# assets.add_khafile_def('arm_degrees')
|
# assets.add_khafile_def('arm_degrees')
|
||||||
|
|
||||||
|
# Allow libraries to recognize Armory
|
||||||
|
assets.add_khafile_def('armory')
|
||||||
|
|
||||||
for d in assets.khafile_defs:
|
for d in assets.khafile_defs:
|
||||||
khafile.write("project.addDefine('" + d + "');\n")
|
khafile.write("project.addDefine('" + d + "');\n")
|
||||||
|
|
||||||
for p in assets.khafile_params:
|
for p in assets.khafile_params:
|
||||||
khafile.write("project.addParameter('" + p + "');\n")
|
khafile.write("project.addParameter('" + p + "');\n")
|
||||||
|
|
||||||
# Let libraries differentiate between Armory and pure Kha
|
|
||||||
assets.add_khafile_def('armory')
|
|
||||||
|
|
||||||
if state.target.startswith('android'):
|
if state.target.startswith('android'):
|
||||||
bundle = 'org.armory3d.' + wrd.arm_project_package if wrd.arm_project_bundle == '' else wrd.arm_project_bundle
|
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)))
|
khafile.write("project.targetOptions.android_native.package = '{0}';\n".format(arm.utils.safestr(bundle)))
|
||||||
|
|
Loading…
Reference in a new issue