Edits to make GWT compilation work
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="io.anuke.mindustry"
|
package="io.anuke.mindustry"
|
||||||
android:versionCode="1"
|
android:versionCode="2"
|
||||||
android:versionName="1.0" >
|
android:versionName="1.01" >
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
|
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -77,8 +77,8 @@ project(":core") {
|
|||||||
apply plugin: "java"
|
apply plugin: "java"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
//compile fileTree(dir: '../core/lib', include: '*.jar')
|
compile fileTree(dir: '../core/lib', include: '*.jar')
|
||||||
compile 'com.github.Anuken:ucore:b58e4bd'
|
//compile 'com.github.Anuken:ucore:b58e4bd'
|
||||||
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
|
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
|
||||||
compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
|
compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ public class Control extends RendererModule{
|
|||||||
Sounds.load("shoot.wav", "place.wav", "explosion.wav", "enemyshoot.wav",
|
Sounds.load("shoot.wav", "place.wav", "explosion.wav", "enemyshoot.wav",
|
||||||
"corexplode.wav", "break.wav", "spawn.wav", "flame.wav", "die.wav",
|
"corexplode.wav", "break.wav", "spawn.wav", "flame.wav", "die.wav",
|
||||||
"respawn.wav", "purchase.wav", "flame2.wav");
|
"respawn.wav", "purchase.wav", "flame2.wav");
|
||||||
|
|
||||||
Musics.load("1.mp3", "2.mp3", "3.mp3");
|
Musics.load("1.mp3", "2.mp3", "3.mp3");
|
||||||
|
|
||||||
Generator.loadMaps();
|
Generator.loadMaps();
|
||||||
|
|||||||
+2
-1
@@ -3,7 +3,7 @@ apply plugin: "jetty"
|
|||||||
|
|
||||||
gwt {
|
gwt {
|
||||||
gwtVersion='2.8.0' // Should match the gwt version used for building the gwt backend
|
gwtVersion='2.8.0' // Should match the gwt version used for building the gwt backend
|
||||||
maxHeapSize="1G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY
|
maxHeapSize="2G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY
|
||||||
minHeapSize="1G"
|
minHeapSize="1G"
|
||||||
|
|
||||||
src = files(file("src/")) // Needs to be in front of "modules" below.
|
src = files(file("src/")) // Needs to be in front of "modules" below.
|
||||||
@@ -13,6 +13,7 @@ gwt {
|
|||||||
|
|
||||||
compiler {
|
compiler {
|
||||||
strict = true;
|
strict = true;
|
||||||
|
//enableClosureCompiler = true;
|
||||||
disableCastChecking = true;
|
disableCastChecking = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,5 @@
|
|||||||
|
|
||||||
<entry-point class='io.anuke.mindustry.client.HtmlLauncher' />
|
<entry-point class='io.anuke.mindustry.client.HtmlLauncher' />
|
||||||
<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
|
<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
|
||||||
<set-configuration-property name="gdx.assetpath" value="../core/assets" />
|
<set-configuration-property name="gdx.assetpath" value="../android/assets" />
|
||||||
</module>
|
</module>
|
||||||
|
|||||||
Reference in New Issue
Block a user