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 20073760..0325d1f5 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 8a940b24..00000000 --- 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 80c17dd9..00000000 --- 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 f2fe1559..00000000 --- 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 4ab12569..00000000 --- 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 zcmaJ?X;2eq7>)rHkVvp9NEuy%97RcX1BN6D5^@l#p)rD{Rw+3a6D8SYvk(FvfLbC} z1aG8Ru+}NH+ExS=L@H8>!gz}$AXGVIK(r|6ICykpMf;<4XLi41p67Yr_j{jjcAGRN zisJ0)Od^pe(PDv&7{#{NaU$`J8!V3^hMBlfjxR$Jaiao*Njx>8gn?+CVht>V6>3xR zC3qo;WCv(t<+xn3gsVbybcGE=Pt&0Un?zc;C=FGp*1ES3{rtC5MV)cC^#fEG;|)o1R;x-$n>8Qbm)6oz2V(45eLRdQ=klp4%$i@14<$$lUp60Dq1CGq zqv0)DBH>2s4Y)$Df};gtG=fjpYSr9e5sS^{gv^K7AOu0e5Kagi6!BOf#D+jVKR9xX zD?n5!I#`d7an&EVtZ}(EBj`{fvH-@ksjymvAv)k~!CdY5xde}^_l~O`KbMekxeOv1 zhOMptYV+6@;T_xby=jTXd)vc$!s{4e>RtE!VdAbliWcx<)2t6yt={<^=yK}V`RlLV zY&v!B5RwsiEWq8oCh2C5?~NbLlncG%>)x6d;dA|J3$j|DPmT*d0yEh#@R}=;HhTL_TTtHf1U)KC=ee3p_if3+<-4e3N zPl__{OqqVmmFgyo_NEMn#19mY7alox*aaN08z?`vrYij$f7bhzo7Y){@J&0_y7vx0h1Q=+aa#A%96R`4?ZaIB==k z#NVh*&eI$+uUal8eO}^m+`;6REvhR}SN_!Q=G49APwIr@o?GQ?>DRkJa#lYU;7?Wpc7Qo zeX#7TyrL*?PPryPX`wd7pU$0A-qFunTk^xU_=erf)q{@`mU$Dc0sbnqaJxpBmG{o3 zTFWizd-$yfQ`HM7_K@!(py+3zozVA1kUeDQ$m;){cKKyvmB&;~+~E0$y{24uRb5K` zO<|~XN8bKFx*oK5jmkS~XIt)O?ei2|xf?OEKD;!bIQxLn?zVqBF0APjw~Q8Gd(K>M zZkmTU4iAoW&!)s$hweOo6TiW_uD0WWb?EfQwxPc83>2$rR!*548JO#HtaZ!7$Cl43 zi;oxw&#y?Dd$nP4V^wQ$kWpQ;!RPMHsI}pu#?ADC&YGT<#s;x^DA~R+Hw8*JPO7G` zR}MAFjZcrx5z|>)JyhOi%kw)M2dNcPfY#k_tjTSTCpGa$U+s6-|Jbtfx?%N2PRvnq zhQn~a0B-AGxA(Tyjw~_#D&DraC%?s$d77|0B+4|WjFe6oh+Aqt+v&btzPR@a#VI1i zZ|7oOIW~!(z7h?R>GCtDZw<_?Eq(RicPnCi*^tI~2FR ab_Pj}p;wG84Xdkc|H5ctjNn9MLiXPzGX8D= diff --git a/src_android/res/drawable-ldpi/icon.png b/src_android/res/drawable-ldpi/icon.png deleted file mode 100644 index cc72255f4d82ba8a37c32f523e74b13c448a7e8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1046 zcmaJ=O=#0#7|s;NoNR(HUB?a|nSwamB>h>Juy)j@b(N*euF@(hOOtO~)+S#}zS$q< z4|)=Y(~GBFya@9kh=(x;ZXgJryom^2JP1?g@F2)Q=9jMRJXizy{&=3}ectzbzq@0} zGacKiyj zQTu_G&f=^zDkwjhy=y8fje#h#AP9I^ zx55svV1V;*K7TM6JO#Wg$1<#!;k<4xDEPbr%YxcRlW3MYDWt@BEf(2@=xK~ifnkcp zqNnKdAZv=@c%FAOyk0j!xb3om<&xX5`|1iJv=vJ;v4#xbD9SlBi$gSVx|@P-He?OE zRwhy~rX-sT=V6_c>Oe{QKUCKnXd9>Cp5K28+v&0inH03qtfi2Po9uH!nL^ZpGDcP! zp+dciW77yDdm5P_IvxNS%}`O%uA(JLNEkMj4Fx8|5KZ_VO;d#^&-r=3$a8}%%W*M3 zA7i-)7xV{$e!th}jn}y%Qf75%;5t{`<3^ftokq}25?O?nb`7d=3+bSmu%I>f5^Snh ztEMgKO(*3EE`QrHjTE22I+N+H1%=xv7bDM`Ggormp*)ZnCM&w zZ87~-a_eU5{qoWQZE@!7{nv9x+E0di*`DW53NH^oc+{QWyzt$ZY3-i4)lwbab$wo3 z?Vq`K+2uQ0+2FFnvBGxw{5eKn_>p!!{<7jeyWM(cV{>Wr1(-`5oDW}GS# qeq!h6689{wE7!xnKdoHMbhflozq)+O3!rDqd8vt5Qha)P;`Seg@K4GB 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 zcmV;L17-Y)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0009CNklCic*VxD}dWNC;u)I zanuBAva--V)uPJeJ|&ZH3Ia9!rS8KxSu>_Kk^=Eb08ceN)J`v7kq#2Ty(UbS9Ku=O zZZnemluW+KJoqrmm8=9)uSo;bw#htcz%;&?A}h&ZUxJkcB0h5C%ON^hGhmdi(hD3d zVxD{qK@QOwjiN~qsL4vqlh(e~@lZ=3lLn~Katxr-%jt3C=Le9@;9i>oxKEA!P(S@m z4W<==b_`(Ce1aIHh=Rj?f)toeD+29U2y%!{6sFD8rU32>!es8>Dns8)Bj5^5sc3+O zDS%41Bh)|HLiT~`(3sMrkJ=^Wi&^kDHIU7Kn)n3qNdQ~w6JQJvLDme}2c!d-QqjN@ zUk+i^NXfGhC80$kfZ*zr&^fK$VB0LKEbbU#A>%%MI8 zfYs}r|1Q0;sI>Xop$0xzR-9&ZBqa}guEiY18()KFtlH~YFDWa>;8-uCf-5aGLV?$} zEd@`D)LNA}i1z(kf!K4U<_Mx!CY|Mrs@={av=8p*b9ff%nlgyBne)Z;vAiB_h5*(h zCRkk_HgC_Nt!h5km)T<24AXM0|D}fr58yok($K0Ga4nRu#EmUhgQ&(>l}2>h+rk{6 z-c%H-SA$wSq7x&adr|Kru(Up+;fsh-@ZfkO7mKyrhFSNV3lp1f-S57Er#VC?D;oZq wc - - raylib -