refactor: add README + Makefile + ci

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '04:00'
+  open-pull-requests-limit: 10
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '04:00'
+  open-pull-requests-limit: 10

.github/workflows/android-macOS.yml

@@ -0,0 +1,22 @@
+name: android-macOS
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - run: make init
+    - run: make demo
+    - run: make build
+    - uses: actions/upload-artifact@v2
+      with:
+        name: heapsapp-debug.apk
+        path: heaps-android-app/heapsapp/build/outputs/apk/debug/heapsapp-debug.apk

.github/workflows/android-windows.yml

@@ -0,0 +1,22 @@
+name: android-windows
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - run: make init
+    - run: make demo
+    - run: make build
+    - uses: actions/upload-artifact@v2
+      with:
+        name: heapsapp-debug.apk
+        path: heaps-android-app/heapsapp/build/outputs/apk/debug/heapsapp-debug.apk

.gitmodules

@@ -11,3 +11,9 @@
 [submodule "openal-soft"]
 	path = openal-soft
 	url = https://github.com/kcat/openal-soft.git
+[submodule "heaps-android-app"]
+	path = heaps-android-app
+	url = https://github.com/rtissera/heaps-android-app.git
+[submodule "heaps"]
+	path = heaps
+	url = https://github.com/HeapsIO/heaps.git

CMakeLists.txt

@@ -9,6 +9,7 @@ include_directories(hashlink/src)
 file(GLOB libhl
     hashlink/src/std/*.c
 	hashlink/src/alloc.c
+	hashlink/src/gc.c
 )
 list(REMOVE_ITEM libhl ${CMAKE_CURRENT_SOURCE_DIR}/hashlink/src/std/debug.c)
 
@@ -27,8 +28,9 @@ target_link_libraries(hl log)
 
 set(TJ_LIB ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/obj/local/${ANDROID_ABI}/libjpeg-turbo.a)
 add_custom_target(turbojpeg
-	${ANDROID_NDK}/ndk-build APP_ABI=${ANDROID_ABI}  APP_PLATFORM=${ANDROID_PLATFORM}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo
+	${ANDROID_NDK}/ndk-build APP_ABI=${ANDROID_ABI} APP_PLATFORM=${ANDROID_PLATFORM}
+	NDK_PROJECT_PATH=./libjpeg-turbo
+	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
 	BYPRODUCTS ${TJ_LIB}
 )
 
@@ -37,6 +39,7 @@ file(GLOB png hashlink/include/png/*.c)
 file(GLOB zlib hashlink/include/zlib/*.c)
 file(GLOB vorbis hashlink/include/vorbis/*.c)
 file(GLOB mikkt hashlink/include/mikktspace/*.c)
+file(GLOB minimp3 hashlink/include/minimp3/*.c)
 
 add_library(fmt.hdll STATIC
 	${fmt}
@@ -51,9 +54,10 @@ file(GLOB tj_include libjpeg-turbo/jni/vendor/libjpeg-turbo/libjpeg-turbo-*)
 target_link_libraries(fmt.hdll ${TJ_LIB})
 target_compile_definitions(fmt.hdll PRIVATE PNG_ARM_NEON_OPT=0) #disable Neon support for now
 
-target_include_directories(fmt.hdll PRIVATE 
+target_include_directories(fmt.hdll PRIVATE
 	hashlink/include/png
 	hashlink/include/mikktspace
+	hashlink/include/minimp3
 	hashlink/include/vorbis
 	hashlink/include/zlib
 	${tj_include}
@@ -65,7 +69,7 @@ add_subdirectory(sdl2)
 file(GLOB sdl hashlink/libs/sdl/*.c)
 add_library(sdl.hdll STATIC ${sdl})
 target_include_directories(sdl.hdll PUBLIC sdl2/include)
-target_link_libraries(sdl.hdll SDL2 EGL GLESv3)
+target_link_libraries(sdl.hdll SDL2 SDL2main EGL GLESv3)
 
 # OpenAL
 
@@ -83,6 +87,6 @@ add_library(ui.hdll STATIC ${ui})
 
 # Heaps Application
 
-add_library(heapsapp SHARED out/main.c )
+add_library(heapsapp SHARED out/main.c jni.c)
 target_include_directories(heapsapp PRIVATE out)
 target_link_libraries(heapsapp hl sdl.hdll fmt.hdll openal.hdll ui.hdll)

Makefile

@@ -0,0 +1,47 @@
+.PHONY: all init build install clean demo
+
+all: build install
+
+init:
+ifeq ($(OS),Windows_NT)
+	powershell ./hashlink.ps1 1.11.0
+	choco install --no-progress haxe openal ffmpeg android-sdk android-ndk
+else ifeq ($(shell uname -s),Darwin)
+	brew install haxe
+	brew bundle install --file hashlink/Brewfile --no-lock
+	brew cask install android-studio
+	chmod u+x /Applications/Android\ Studio.app/Contents/plugins/android/lib/templates/gradle/wrapper/gradlew
+endif
+	make -C hashlink
+	make install -C hashlink
+	haxelib setup /usr/local/lib/haxe/lib
+	make gen-local
+
+build:
+	CMD=assembleDebug make gradle
+
+install:
+	adb install heaps-android-app/heapsapp/build/outputs/apk/debug/heapsapp-debug.apk
+
+clean:
+	CMD=clean make gradle
+
+ifeq ($(OS),Windows_NT)
+gradle:
+	cd heaps-android-app && gradlew.bat $(CMD)
+gen-local:
+	(echo sdk.dir=C:\\Android\\android-sdk&& echo ndk.dir=C:\\Android\\android-ndk-r21d) > heaps-android-app/local.properties
+else ifeq ($(shell uname -s),Darwin)
+gradle:
+	/Applications/Android\ Studio.app/Contents/plugins/android/lib/templates/gradle/wrapper/gradlew $(CMD) -p heaps-android-app
+gen-local:
+	echo "sdk.dir=$(HOME)/Library/Android/sdk" > heaps-android-app/local.properties
+endif
+
+demo: demo-hl demo-pak
+
+demo-hl:
+	cd heaps/samples && haxelib install --always ../../config/main.hxml && haxe -hl ../../out/main.c ../../config/main.hxml
+
+demo-pak:
+	cd heaps/samples && haxe -hl ../../out/pak.hl ../../config/pak.hxml && hl ../../out/pak.hl -out ../../out/res

README.md

@@ -0,0 +1,18 @@
+# Heaps Android
+
+![android](https://github.com/HeapsIO/heaps-android/workflows/android/badge.svg?branch=master)
+
+## Setup
+
+```sh
+git clone --recursive https://github.com/HeapsIO/heaps-android
+cd heaps-android
+make init
+```
+
+## Usage
+
+```sh
+make demo
+make # make build && make install
+```

config/base.hxml

@@ -0,0 +1,8 @@
+World.hx
+-lib heaps
+-lib hlsdl
+-lib hxbit
+-lib format
+-lib hashlink
+-D windowSize=1024x768
+-D resourcesPath=world_res

config/main.hxml

@@ -0,0 +1,2 @@
+../../config/base.hxml
+-main World

config/pak.hxml

@@ -0,0 +1,2 @@
+../../config/base.hxml
+-main hxd.fmt.pak.Build

hashlink.ps1

@@ -0,0 +1,4 @@
+Invoke-WebRequest https://github.com/HaxeFoundation/hashlink/releases/latest/download/hl-$args[0]-win.zip -OutFile hl.zip
+Expand-Archive hl.zip -DestinationPath .
+Move-Item hl-* $HOME/hashlink
+Remove-Item hl.zip

heaps-android-app/README.md

@@ -0,0 +1 @@
+# heaps-android-app

heaps-android-app/build.gradle

@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

heaps-android-app/gradle.properties

@@ -0,0 +1,14 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+

heaps-android-app/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists