From 688045307a20e64b797bf487e72375cfcfaee601 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 13:52:06 +0200 Subject: [PATCH] Reorganize folder for Android library Android build system has been simplified and now is included in src folder, like other build systems. --- {src_android => src/android}/jni/Android.mk | 24 ++--- .../android}/jni/Application.mk | 0 .../android}/jni/include/AL/al.h | 0 .../android}/jni/include/AL/alc.h | 0 .../android}/jni/include/AL/alext.h | 0 .../android}/jni/include/AL/efx-creative.h | 0 .../android}/jni/include/AL/efx.h | 0 .../jni/include/AL/oalMacOSX_OALExtensions.h | 0 .../jni/include/AL/oalStaticBufferExtension.h | 0 .../jni/include/android_native_app_glue.h | 0 src_android/AndroidManifest.xml | 29 ------ src_android/build.xml | 92 ------------------ src_android/proguard-project.txt | 20 ---- src_android/project.properties | 14 --- src_android/res/drawable-hdpi/icon.png | Bin 1912 -> 0 bytes src_android/res/drawable-ldpi/icon.png | Bin 1046 -> 0 bytes src_android/res/drawable-mdpi/icon.png | Bin 922 -> 0 bytes src_android/res/values/strings.xml | 4 - 18 files changed, 12 insertions(+), 171 deletions(-) rename {src_android => src/android}/jni/Android.mk (79%) rename {src_android => src/android}/jni/Application.mk (100%) rename {src_android => src/android}/jni/include/AL/al.h (100%) rename {src_android => src/android}/jni/include/AL/alc.h (100%) rename {src_android => src/android}/jni/include/AL/alext.h (100%) rename {src_android => src/android}/jni/include/AL/efx-creative.h (100%) rename {src_android => src/android}/jni/include/AL/efx.h (100%) rename {src_android => src/android}/jni/include/AL/oalMacOSX_OALExtensions.h (100%) rename {src_android => src/android}/jni/include/AL/oalStaticBufferExtension.h (100%) rename {src_android => src/android}/jni/include/android_native_app_glue.h (100%) delete mode 100644 src_android/AndroidManifest.xml delete mode 100644 src_android/build.xml delete mode 100644 src_android/proguard-project.txt delete mode 100644 src_android/project.properties delete mode 100644 src_android/res/drawable-hdpi/icon.png delete mode 100644 src_android/res/drawable-ldpi/icon.png delete mode 100644 src_android/res/drawable-mdpi/icon.png delete mode 100644 src_android/res/values/strings.xml diff --git a/src_android/jni/Android.mk b/src/android/jni/Android.mk similarity index 79% rename from src_android/jni/Android.mk rename to src/android/jni/Android.mk index 200737604..0325d1f5f 100644 --- a/src_android/jni/Android.mk +++ b/src/android/jni/Android.mk @@ -37,22 +37,22 @@ LOCAL_MODULE := raylib # Module source files LOCAL_SRC_FILES :=\ - ../../src/core.c \ - ../../src/rlgl.c \ - ../../src/textures.c \ - ../../src/text.c \ - ../../src/shapes.c \ - ../../src/gestures.c \ - ../../src/models.c \ - ../../src/utils.c \ - ../../src/audio.c \ - ../../src/stb_vorbis.c \ + ../../core.c \ + ../../rlgl.c \ + ../../textures.c \ + ../../text.c \ + ../../shapes.c \ + ../../gestures.c \ + ../../models.c \ + ../../utils.c \ + ../../audio.c \ + ../../stb_vorbis.c \ # Required includes paths (.h) -LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../../src +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../.. # Required flags for compilation: defines PLATFORM_ANDROID and GRAPHICS_API_OPENGL_ES2 -LOCAL_CFLAGS := -Wall -std=c99 -g -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2 +LOCAL_CFLAGS := -Wall -std=c99 -Wno-missing-braces -g -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2 # Build the static library libraylib.a include $(BUILD_STATIC_LIBRARY) diff --git a/src_android/jni/Application.mk b/src/android/jni/Application.mk similarity index 100% rename from src_android/jni/Application.mk rename to src/android/jni/Application.mk diff --git a/src_android/jni/include/AL/al.h b/src/android/jni/include/AL/al.h similarity index 100% rename from src_android/jni/include/AL/al.h rename to src/android/jni/include/AL/al.h diff --git a/src_android/jni/include/AL/alc.h b/src/android/jni/include/AL/alc.h similarity index 100% rename from src_android/jni/include/AL/alc.h rename to src/android/jni/include/AL/alc.h diff --git a/src_android/jni/include/AL/alext.h b/src/android/jni/include/AL/alext.h similarity index 100% rename from src_android/jni/include/AL/alext.h rename to src/android/jni/include/AL/alext.h diff --git a/src_android/jni/include/AL/efx-creative.h b/src/android/jni/include/AL/efx-creative.h similarity index 100% rename from src_android/jni/include/AL/efx-creative.h rename to src/android/jni/include/AL/efx-creative.h diff --git a/src_android/jni/include/AL/efx.h b/src/android/jni/include/AL/efx.h similarity index 100% rename from src_android/jni/include/AL/efx.h rename to src/android/jni/include/AL/efx.h diff --git a/src_android/jni/include/AL/oalMacOSX_OALExtensions.h b/src/android/jni/include/AL/oalMacOSX_OALExtensions.h similarity index 100% rename from src_android/jni/include/AL/oalMacOSX_OALExtensions.h rename to src/android/jni/include/AL/oalMacOSX_OALExtensions.h diff --git a/src_android/jni/include/AL/oalStaticBufferExtension.h b/src/android/jni/include/AL/oalStaticBufferExtension.h similarity index 100% rename from src_android/jni/include/AL/oalStaticBufferExtension.h rename to src/android/jni/include/AL/oalStaticBufferExtension.h diff --git a/src_android/jni/include/android_native_app_glue.h b/src/android/jni/include/android_native_app_glue.h similarity index 100% rename from src_android/jni/include/android_native_app_glue.h rename to src/android/jni/include/android_native_app_glue.h diff --git a/src_android/AndroidManifest.xml b/src_android/AndroidManifest.xml deleted file mode 100644 index 8a940b242..000000000 --- a/src_android/AndroidManifest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src_android/build.xml b/src_android/build.xml deleted file mode 100644 index 80c17dd9f..000000000 --- a/src_android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src_android/proguard-project.txt b/src_android/proguard-project.txt deleted file mode 100644 index f2fe1559a..000000000 --- a/src_android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/src_android/project.properties b/src_android/project.properties deleted file mode 100644 index 4ab125693..000000000 --- a/src_android/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 diff --git a/src_android/res/drawable-hdpi/icon.png b/src_android/res/drawable-hdpi/icon.png deleted file mode 100644 index 34a6155e672e93c92dc43020ff234a378429127f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1912 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dBuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFe_w+M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`Gtf;oFf&jv zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAql)45_&FCMLFju>sGP)%z~~{a?Rj&%FFfk+S zIPar7Q&w8h*1u)DLkcus1O=q-{;nSKwSCH$-}%P^a_8@Ty!T(mX{rAn&+OA)ZBlse z67lrK!P<${3m?n(CUYFgQQ9N-W&7NJk=H~e>&@IdnvGZu+7sk5Hayn;c%fb93jdCE zulL8RRvs?Sy{%r<)Auv$^d=dt0xrY%EVjbmH3~{6t{_cq}n<9O5Fe5FkywIh(;Jo zQBHl^V!zKxg8WTRI?CrZa&`1FxpF4lnR8Fw`jT6+mPC>pTV0TWqgtQSju%^s+C?20 zLZx20yeMi{+m*S5N2#TC!Ko`6M~=+wUMSE}5LhPT>g+R@X@hEqhgP5<+W~>oTq3Lu z=Wm|OiCiGDmbFr?$?ed@lx=J72y#AYc_6^JR;o3^BA{oI0aN3vB6q1HJPi(^mWvK~ zx9y!Fo^UI-Y7yD$uuZDL?UVd^jYVQJW_l^`uU>LT@aBXGzMpuW9FF7R{iY=IXswkNr{U}; zvsUhm*gCsUWpjo`(oKQWaof98Hs5>Yn6+RB)%IvE8Q#P-rXPR&{LbUw5%>4Y-@My6P0HomU5BqVb_+G;Hq9t!zN&tw#C7ir zk88gt7ERf4@yuzRe2y<~zdn)Y4Y~F4`uG2FwYReO-+O-R`c!W8=xlyE;hL1ucFF0LhHecV zrC%2^z77rS*m+;PJHq?fIbKeOQnh|>$IV6T&Q(zbxzG!j?J4kiW$hP)*H^9&3Ok|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3m8Da#=fE;F*!T6 zL?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRu#Dg zxv3?I3Kh9IdBs*0wn|`gt@4VkK*IV;3ScEA*|tg$M@9GsC^+XAr7D=}8R#Y(m>DRT z8R{7to0yxM>nIo*7#ips80i}t=^C0_85>y{7$`u2lAVH0QA(Oskc%7CuA-DQTcwPW zk^(Dz{qpj1y>er{{GxPyLrY6bkQqisxCgqow*eWSOjjhNnfE$}v3=O8_{9OHt!~%UoJp+)JAb!m)@b$&7G&dKny0|1L z72#g21{a4^7NqJ2r55Lx7A2*agWWAnntVWDW%TC5XYV)d` zeL@o#N@Tx{d}kcaCXvv<2qvzHKAW>!JF72N(pbFerD24uu{POKepIr(yp4>flF+1l-%EbNOUw1&`|JRj<8{Kk~Ywi9%+8Gtj$H>O;L)3VC Tzk<|zP)_x9^>bP0l+XkKhVW0y diff --git a/src_android/res/drawable-mdpi/icon.png b/src_android/res/drawable-mdpi/icon.png deleted file mode 100644 index 72713a973d1767d18987faa0bf8806571a28fad6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4kiW$h8qca7Z?~A7>k44ofy`glX=O&z`&C3 z=^if=j%~{_o+@5(JhgEOV@K|F6^2g) z&Q*DSw)?Q4;p$%hRY$lDozF~KuBpvvEyKLyddta8PQ8H-0xlaDzPw<$ENNcN%BLc8 zH7rd07;RPvX?k!JaV)-f<(cM^W|j{j%t?%PuA9_m^+p)7PG;-dr`h0T=rxHwb86=s z=Bo<}udrlo+H}G0>Y`Im>{KV`b1|9zS^DmZLj$0$4}%FI}?Bhry|-YgmHUdoo|%cG4#EfXTiYO4=tAe1TXC_7XThb@FAJYMXP}xURlQQj{8u` zyZc(s_kENfaQUpvXlT`J@Y=3?#r~$#x5if&W?Wj_e@pdgcjO0i(+OuAX8mCK=*bZM zN;rXs-|-sHP4*?sGlDK25RT_dyy9`zqEz5r?WS2ZK`-uWt)CspWRcaN{ow#p%x$|H z9|MdVf)5un9B0~4V(;|-%tAZ1hO4jV{@2^PamALOw-&P5g@?^aD^XG9uUU6g=BRXh zbK06)uOsy}wU0lD&|lo7t!wJkczwGrtAF>EsHv76-~L87-Y8!BjAK!_+T5qztL~mt z+QR?td2xl<%UMPpTW5Yg`eoxDx!g8}YszX7v2tel=NGQcvb#S0X3`Cw%SCJdFKy@G ze_+da>B1`U0^KPaj`Zq=HLo}pG1aZ)*6l+w3+{!8tO{?AvRNdoyr4Spz4C@Fc8eZ% zcLaWTP@yc|z4cC8g#0JUpG$@dGXCO<{>EeF?hQAxvX - - raylib -