removed submodules for now

.gitignore

@@ -1,3 +1,4 @@
+## OLD
 bin
 build
 gen
@@ -6,3 +7,129 @@ local.*
 libs
 *~
 *_app.jar
+
+## Java
+
+*.class
+*.war
+*.ear
+hs_err_pid*
+
+## Robovm
+/ios/robovm-build/
+
+## GWT
+/html/war/
+/html/gwt-unitCache/
+.apt_generated/
+.gwt/
+gwt-unitCache/
+www-test/
+.gwt-tmp/
+
+## Android Studio and Intellij and Android in general
+/android/libs/armeabi/
+/android/libs/armeabi-v7a/
+/android/libs/arm64-v8a/
+/android/libs/x86/
+/android/libs/x86_64/
+/android/gen/
+.idea/
+*.ipr
+*.iws
+*.iml
+/android/out/
+com_crashlytics_export_strings.xml
+
+## Eclipse
+
+.classpath
+.project
+.metadata/
+/android/bin/
+/core/bin/
+/desktop/bin/
+/html/bin/
+/ios/bin/
+/ios-moe/bin/
+*.tmp
+*.bak
+*.swp
+*~.nib
+.settings/
+.loadpath
+.externalToolBuilders/
+*.launch
+
+## NetBeans
+
+/nbproject/private/
+/android/nbproject/private/
+/core/nbproject/private/
+/desktop/nbproject/private/
+/html/nbproject/private/
+/ios/nbproject/private/
+/ios-moe/nbproject/private/
+
+/build/
+/android/build/
+/core/build/
+/desktop/build/
+/html/build/
+/ios/build/
+/ios-moe/build/
+
+/nbbuild/
+/android/nbbuild/
+/core/nbbuild/
+/desktop/nbbuild/
+/html/nbbuild/
+/ios/nbbuild/
+/ios-moe/nbbuild/
+
+/dist/
+/android/dist/
+/core/dist/
+/desktop/dist/
+/html/dist/
+/ios/dist/
+/ios-moe/dist/
+
+/nbdist/
+/android/nbdist/
+/core/nbdist/
+/desktop/nbdist/
+/html/nbdist/
+/ios/nbdist/
+/ios-moe/nbdist/
+
+nbactions.xml
+nb-configuration.xml
+
+## Gradle
+
+/local.properties
+.gradle/
+gradle-app.setting
+/build/
+/android/build/
+/core/build/
+/desktop/build/
+/html/build/
+/ios/build/
+/ios-moe/build/
+
+## OS Specific
+.DS_Store
+Thumbs.db
+
+## iOS
+/ios/xcode/*.xcodeproj/*
+!/ios/xcode/*.xcodeproj/xcshareddata
+!/ios/xcode/*.xcodeproj/project.pbxproj
+/ios/xcode/native/
+
+/ios-moe/xcode/*.xcodeproj/*
+!/ios-moe/xcode/*.xcodeproj/xcshareddata
+!/ios-moe/xcode/*.xcodeproj/project.pbxproj
+/ios-moe/xcode/native/

Makefile

@@ -4,7 +4,7 @@
 
 INKSCAPE=inkscape
 
-MARM = java -jar submodules/marm/marm_app.jar hiero=libs/bin/hiero -v
+MARM = java -jar submodules/marm/marm_app.jar hiero=libs/bin/hiero
 COMPO= java -jar submodules/composition/Composition_app.jar
 
 ##
@@ -13,28 +13,28 @@ all: icons marm
 
 
 icons:
-	mkdir -p res/drawable-ldpi
-	mkdir -p res/drawable-mdpi
-	mkdir -p res/drawable-hdpi
-	mkdir -p res/drawable-xhdpi
-	mkdir -p res/drawable-xxhdpi
-	$(INKSCAPE) -z extra/icon.svg  -w 36 -h 36 -e res/drawable-ldpi/ic_launcher.png
-	$(INKSCAPE) -z extra/icon.svg  -w 48 -h 48 -e res/drawable-mdpi/ic_launcher.png
-	$(INKSCAPE) -z extra/icon.svg  -w 72 -h 72 -e res/drawable-hdpi/ic_launcher.png
-	$(INKSCAPE) -z extra/icon.svg  -w 96 -h 96 -e res/drawable-xhdpi/ic_launcher.png
-	$(INKSCAPE) -z extra/icon.svg  -w 144 -h 144 -e res/drawable-xhdpi/ic_launcher.png
+	mkdir -p android/res/drawable-ldpi
+	mkdir -p android/res/drawable-mdpi
+	mkdir -p android/res/drawable-hdpi
+	mkdir -p android/res/drawable-xhdpi
+	mkdir -p android/res/drawable-xxhdpi
+	$(INKSCAPE) -z extra/icon.svg  -w 36 -h 36 -e android/res/drawable-ldpi/ic_launcher.png
+	$(INKSCAPE) -z extra/icon.svg  -w 48 -h 48 -e android/res/drawable-mdpi/ic_launcher.png
+	$(INKSCAPE) -z extra/icon.svg  -w 72 -h 72 -e android/res/drawable-hdpi/ic_launcher.png
+	$(INKSCAPE) -z extra/icon.svg  -w 96 -h 96 -e android/res/drawable-xhdpi/ic_launcher.png
+	$(INKSCAPE) -z extra/icon.svg  -w 144 -h 144 -e android/res/drawable-xhdpi/ic_launcher.png
 
 marm:
-	rm -rf assets/1
-	rm -rf assets/2
-	rm -rf assets/4
-	$(MARM) resize -1 extra/assets assets
+	rm -rf android/assets/1
+	rm -rf android/assets/2
+	rm -rf android/assets/4
+	$(MARM) resize -1 extra/assets android/assets
 
 compo:
-	$(COMPO) assets/compo/compo.bin
+	$(COMPO) android/assets/compo/compo.bin
 ##
 
 clean:
-	rm -rf assets/1
+	rm -rf android/assets/1
 	rm -rf $(CLEAN_ADD)
-	rm -rf res/drawable-*/ic_launcher.png
+	rm -rf android/res/drawable-*/ic_launcher.png

android/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="se.tube42.kidsmem.android" >
+
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="26" />
+
+  <!-- Tell the system this app requires OpenGL ES 2.0. -->
+  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+
+    <application
+        android:allowBackup="true"    
+        android:largeHeap="true"        
+        android:icon="@drawable/ic_launcher"
+        android:label="Candy Memory"
+        android:theme="@style/GdxTheme" >
+
+    <activity android:name="MainActivity" 
+        android:label="Candy Memory" 
+        android:screenOrientation="portrait">
+      <intent-filter>        
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+</manifest>