diff --git a/examples/Makefile.Android b/examples/Makefile.Android index afa3024ac..f4a35dc66 100644 --- a/examples/Makefile.Android +++ b/examples/Makefile.Android @@ -57,8 +57,7 @@ endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk -ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_HOME ?= C:/android-sdk ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools @@ -81,9 +80,9 @@ APP_COMPANY_NAME ?= raylib APP_PRODUCT_NAME ?= rgame APP_VERSION_CODE ?= 1 APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png +APP_ICON_LDPI ?= $(RAYLIB_PATH)/logo/raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)/logo/raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)/logo/raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape APP_KEYSTORE_PASS ?= raylib @@ -91,7 +90,7 @@ APP_KEYSTORE_PASS ?= raylib RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -124,7 +123,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(ANDROID_NDK)/sources/android/native_app_glue # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -159,92 +158,164 @@ all: create_temp_project_dirs \ # Create required temp directories for APK building create_temp_project_dirs: - if not exist $(PROJECT_BUILD_PATH) mkdir $(PROJECT_BUILD_PATH) - if not exist $(PROJECT_BUILD_PATH)\obj mkdir $(PROJECT_BUILD_PATH)\obj - if not exist $(PROJECT_BUILD_PATH)\src mkdir $(PROJECT_BUILD_PATH)\src - if not exist $(PROJECT_BUILD_PATH)\src\com mkdir $(PROJECT_BUILD_PATH)\src\com - if not exist $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) mkdir $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) - if not exist $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME)\$(APP_PRODUCT_NAME) mkdir $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME)\$(APP_PRODUCT_NAME) - if not exist $(PROJECT_BUILD_PATH)\lib mkdir $(PROJECT_BUILD_PATH)\lib - if not exist $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME) mkdir $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME) - if not exist $(PROJECT_BUILD_PATH)\bin mkdir $(PROJECT_BUILD_PATH)\bin - if not exist $(PROJECT_BUILD_PATH)\res mkdir $(PROJECT_BUILD_PATH)\res - if not exist $(PROJECT_BUILD_PATH)\res\drawable-ldpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-ldpi - if not exist $(PROJECT_BUILD_PATH)\res\drawable-mdpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-mdpi - if not exist $(PROJECT_BUILD_PATH)\res\drawable-hdpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-hdpi - if not exist $(PROJECT_BUILD_PATH)\res\values mkdir $(PROJECT_BUILD_PATH)\res\values - if not exist $(PROJECT_BUILD_PATH)\assets mkdir $(PROJECT_BUILD_PATH)\assets - if not exist $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) mkdir $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) - if not exist $(PROJECT_BUILD_PATH)\obj\screens mkdir $(PROJECT_BUILD_PATH)\obj\screens + mkdir -p $(PROJECT_BUILD_PATH) + mkdir -p $(PROJECT_BUILD_PATH)/obj + mkdir -p $(PROJECT_BUILD_PATH)/obj/src + mkdir -p $(PROJECT_BUILD_PATH)/src + mkdir -p $(PROJECT_BUILD_PATH)/src/com + mkdir -p $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/lib + mkdir -p $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/bin + mkdir -p $(PROJECT_BUILD_PATH)/res + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-ldpi + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-mdpi + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-hdpi + mkdir -p $(PROJECT_BUILD_PATH)/res/values + mkdir -p $(PROJECT_BUILD_PATH)/assets + mkdir -p $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH) + mkdir -p $(PROJECT_BUILD_PATH)/obj/screens $(foreach dir, $(PROJECT_SOURCE_DIRS), $(call create_dir, $(dir))) define create_dir - if not exist $(PROJECT_BUILD_PATH)\obj\$(1) mkdir $(PROJECT_BUILD_PATH)\obj\$(1) + mkdir -p $(PROJECT_BUILD_PATH)/obj/$(1) endef +ifeq ($(OS),Windows_NT) + COPY_COMMAND ?= copy /Y + COPY_DIRECTORY_COMMAND = C:\Windows\System32\xcopy /Y /E /F + ANDROID_STRING_XML_LINE1 = ^ + ANDROID_STRING_XML_LINE2 = ^^$(APP_LABEL_NAME)^^ + ANDROID_NATIVE_LOADER_JAVA_LINE1 = package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME); + ANDROID_NATIVE_LOADER_JAVA_LINE2 = . + ANDROID_NATIVE_LOADER_JAVA_LINE3 = public class NativeLoader extends android.app.NativeActivity { + ANDROID_NATIVE_LOADER_JAVA_LINE4 = static { + ANDROID_NATIVE_LOADER_JAVA_LINE5 = System.loadLibrary("raylib"); + ANDROID_NATIVE_LOADER_JAVA_LINE6 = System.loadLibrary("$(PROJECT_LIBRARY_NAME)"); + ANDROID_NATIVE_LOADER_JAVA_LINE7 = } + ANDROID_NATIVE_LOADER_JAVA_LINE8 = } + ANDROID_MANIFEST_XML_LINE1 = ^ + ANDROID_MANIFEST_XML_LINE2 = ^ + ANDROID_MANIFEST_XML_LINE5 = ^ + ANDROID_MANIFEST_XML_LINE6 = ^ + ANDROID_MANIFEST_XML_LINE7 = ^ + ANDROID_MANIFEST_XML_LINE8 = ^ + ANDROID_MANIFEST_XML_LINE13 = ^ + ANDROID_MANIFEST_XML_LINE14 = ^ + ANDROID_MANIFEST_XML_LINE15 = ^ + ANDROID_MANIFEST_XML_LINE16 = ^ + ANDROID_MANIFEST_XML_LINE17 = ^ + ANDROID_MANIFEST_XML_LINE18 = ^ + ANDROID_MANIFEST_XML_LINE19 = ^ + ANDROID_MANIFEST_XML_LINE20 = ^ +else + COPY_COMMAND ?= cp -f + COPY_DIRECTORY_COMMAND = cp -rf + ANDROID_STRING_XML_LINE1 = "" + ANDROID_STRING_XML_LINE2 = "$(APP_LABEL_NAME)" + ANDROID_NATIVE_LOADER_JAVA_LINE1 = "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);" + ANDROID_NATIVE_LOADER_JAVA_LINE2 = "" + ANDROID_NATIVE_LOADER_JAVA_LINE3 = "public class NativeLoader extends android.app.NativeActivity {" + ANDROID_NATIVE_LOADER_JAVA_LINE4 = " static {" + ANDROID_NATIVE_LOADER_JAVA_LINE5 = " System.loadLibrary(\"raylib\");" + ANDROID_NATIVE_LOADER_JAVA_LINE6 = " System.loadLibrary(\"$(PROJECT_LIBRARY_NAME)\");" + ANDROID_NATIVE_LOADER_JAVA_LINE7 = " }" + ANDROID_NATIVE_LOADER_JAVA_LINE8 = "}" + ANDROID_MANIFEST_XML_LINE1 = "" + ANDROID_MANIFEST_XML_LINE2 = "" + ANDROID_MANIFEST_XML_LINE5 = " " + ANDROID_MANIFEST_XML_LINE6 = " " + ANDROID_MANIFEST_XML_LINE7 = " " + ANDROID_MANIFEST_XML_LINE8 = " " + ANDROID_MANIFEST_XML_LINE13 = " " + ANDROID_MANIFEST_XML_LINE14 = " " + ANDROID_MANIFEST_XML_LINE15 = " " + ANDROID_MANIFEST_XML_LINE16 = " " + ANDROID_MANIFEST_XML_LINE17 = " " + ANDROID_MANIFEST_XML_LINE18 = " " + ANDROID_MANIFEST_XML_LINE19 = " " + ANDROID_MANIFEST_XML_LINE20 = "" +endif + # Copy required shared libs for integration into APK # NOTE: If using shared libs they are loaded by generated NativeLoader.java copy_project_required_libs: ifeq ($(RAYLIB_LIBTYPE),SHARED) - copy /Y $(RAYLIB_LIB_PATH)\libraylib.so $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.so + $(COPY_COMMAND) $(RAYLIB_LIB_PATH)/libraylib.so $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME)/libraylib.so endif ifeq ($(RAYLIB_LIBTYPE),STATIC) - copy /Y $(RAYLIB_LIB_PATH)\libraylib.a $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.a + $(COPY_COMMAND) $(RAYLIB_LIB_PATH)/libraylib.a $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME)/libraylib.a endif # Copy project required resources: strings.xml, icon.png, assets # NOTE: Required strings.xml is generated and game resources are copied to assets folder -# TODO: Review xcopy usage, it can not be found in some systems! copy_project_resources: - copy $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)\res\drawable-ldpi\icon.png /Y - copy $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)\res\drawable-mdpi\icon.png /Y - copy $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)\res\drawable-hdpi\icon.png /Y - @echo ^ > $(PROJECT_BUILD_PATH)/res/values/strings.xml - @echo ^^$(APP_LABEL_NAME)^^ >> $(PROJECT_BUILD_PATH)/res/values/strings.xml - if exist $(PROJECT_RESOURCES_PATH) C:\Windows\System32\xcopy $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) /Y /E /F + $(COPY_COMMAND) $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)/res/drawable-ldpi/icon.png + $(COPY_COMMAND) $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)/res/drawable-mdpi/icon.png + $(COPY_COMMAND) $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)/res/drawable-hdpi/icon.png + @echo $(ANDROID_STRING_XML_LINE1) > $(PROJECT_BUILD_PATH)/res/values/strings.xml + @echo $(ANDROID_STRING_XML_LINE2) >> $(PROJECT_BUILD_PATH)/res/values/strings.xml + $(COPY_DIRECTORY_COMMAND) $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH) # Generate NativeLoader.java to load required shared libraries # NOTE: Probably not the bet way to generate this file... but it works. generate_loader_script: - @echo package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME); > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - @echo. >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - @echo public class NativeLoader extends android.app.NativeActivity { >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - @echo static { >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE1) > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo$(ANDROID_NATIVE_LOADER_JAVA_LINE2) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE3) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE4) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java ifeq ($(RAYLIB_LIBTYPE),SHARED) - @echo System.loadLibrary("raylib"); >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE5) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java endif - @echo System.loadLibrary("$(PROJECT_LIBRARY_NAME)"); >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE6) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE7) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo $(ANDROID_NATIVE_LOADER_JAVA_LINE8) >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java # Generate AndroidManifest.xml with all the required options # NOTE: Probably not the bet way to generate this file... but it works. generate_android_manifest: - @echo ^ > $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo package="com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME)" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo android:versionCode="$(APP_VERSION_CODE)" android:versionName="$(APP_VERSION_NAME)" ^> >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo android:configChanges="orientation|keyboardHidden|screenSize" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo android:screenOrientation="$(APP_SCREEN_ORIENTATION)" android:launchMode="singleTask" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo android:clearTaskOnLaunch="true"^> >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE1) > $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE2) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE3) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE4) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE5) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE6) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE7) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE8) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE9) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE10) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE11) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE12) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE13) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE14) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE15) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE16) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE17) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE18) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE19) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo $(ANDROID_MANIFEST_XML_LINE20) >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml # Generate storekey for APK signing: $(PROJECT_NAME).keystore # NOTE: Configure here your Distinguished Names (-dname) if required! generate_apk_keystore: +ifeq ($(OS),Windows_NT) if not exist $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore $(JAVA_HOME)/bin/keytool -genkeypair -validity 10000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA +else + @[ -f "$(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore" ] || $(JAVA_HOME)/bin/keytool -genkeypair -validity 10000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA +endif # Config project package and resource using AndroidManifest.xml and res/values/strings.xml # NOTE: Generates resources file: src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java @@ -253,7 +324,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(ANDROID_NDK)/sources/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so @@ -267,7 +338,7 @@ $(PROJECT_BUILD_PATH)/obj/%.o:%.c # Compile project .java code into .class (Java bytecode) compile_project_class: - $(JAVA_HOME)/bin/javac -verbose -source 1.7 -target 1.7 -d $(PROJECT_BUILD_PATH)/obj -bootclasspath $(JAVA_HOME)/jre/lib/rt.jar -classpath $(ANDROID_HOME)/platforms/android-$(ANDROID_API_VERSION)/android.jar;$(PROJECT_BUILD_PATH)/obj -sourcepath $(PROJECT_BUILD_PATH)/src $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + $(JAVA_HOME)/bin/javac -verbose -source 1.7 -target 1.7 -d $(PROJECT_BUILD_PATH)/obj -bootclasspath $(JAVA_HOME)/jre/lib/rt.jar -classpath $(ANDROID_HOME)/platforms/android-$(ANDROID_API_VERSION)/android.jar -d $(PROJECT_BUILD_PATH)/obj $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java # Compile .class files into Dalvik executable bytecode (.dex) # NOTE: Since Android 5.0, Dalvik interpreter (JIT) has been replaced by ART (AOT) @@ -313,6 +384,10 @@ deploy: # Clean everything clean: +ifeq ($(OS),Windows_NT) del $(PROJECT_BUILD_PATH)\* /f /s /q rmdir $(PROJECT_BUILD_PATH) /s /q +else + rm -r $(PROJECT_BUILD_PATH) +endif @echo Cleaning done