Permalink
Browse files

Merge pull request #442 from littleguy77/gliden64-integration

Gliden64 integration
  • Loading branch information...
littleguy77 committed Jun 6, 2015
2 parents c58e8a7 + 62a376c commit 8edc76770e5056b706b8b644e2bea93b92b64403
Showing with 72,899 additions and 16 deletions.
  1. +25 −0 assets/mupen64plus_data/profiles/emulation.cfg
  2. +2 −0 jni/Android.mk
  3. +164 −0 jni/mupen64plus-video-gliden64.mk
  4. +9 −1 jni/mupen64plus-video-gliden64/.gitignore
  5. +359 −0 jni/mupen64plus-video-gliden64/LICENCE
  6. +4 −0 jni/mupen64plus-video-gliden64/README.md
  7. +339 −0 jni/mupen64plus-video-gliden64/licenses/GlideHQ/gpl-2.0.txt
  8. +25 −0 jni/mupen64plus-video-gliden64/licenses/Glow/LICENSE
  9. +165 −0 jni/mupen64plus-video-gliden64/licenses/gles2n64/LICENSE
  10. +8 −0 jni/mupen64plus-video-gliden64/projects/cmake/Readme.txt
  11. +31 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.sln
  12. +401 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.vcxproj
  13. +353 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.vcxproj.filters
  14. +33 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideNHQ.sln
  15. +290 −0 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj
  16. +58 −0 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj.filters
  17. +46 −0 jni/mupen64plus-video-gliden64/src/3DMath.cpp
  18. +169 −0 jni/mupen64plus-video-gliden64/src/3DMath.h
  19. +216 −0 jni/mupen64plus-video-gliden64/src/CMakeLists.txt
  20. +82 −0 jni/mupen64plus-video-gliden64/src/CRC.cpp
  21. +9 −0 jni/mupen64plus-video-gliden64/src/CRC.h
  22. +302 −0 jni/mupen64plus-video-gliden64/src/Combiner.cpp
  23. +165 −0 jni/mupen64plus-video-gliden64/src/Combiner.h
  24. +66 −0 jni/mupen64plus-video-gliden64/src/CommonPluginAPI.cpp
  25. +86 −0 jni/mupen64plus-video-gliden64/src/Config.cpp
  26. +130 −0 jni/mupen64plus-video-gliden64/src/Config.h
  27. +8 −0 jni/mupen64plus-video-gliden64/src/Debug.h
  28. +354 −0 jni/mupen64plus-video-gliden64/src/DepthBuffer.cpp
  29. +86 −0 jni/mupen64plus-video-gliden64/src/DepthBuffer.h
  30. +300 −0 jni/mupen64plus-video-gliden64/src/F3D.cpp
  31. +97 −0 jni/mupen64plus-video-gliden64/src/F3D.h
  32. +142 −0 jni/mupen64plus-video-gliden64/src/F3DDKR.cpp
  33. +16 −0 jni/mupen64plus-video-gliden64/src/F3DDKR.h
  34. +91 −0 jni/mupen64plus-video-gliden64/src/F3DEX.cpp
  35. +54 −0 jni/mupen64plus-video-gliden64/src/F3DEX.h
  36. +205 −0 jni/mupen64plus-video-gliden64/src/F3DEX2.cpp
  37. +88 −0 jni/mupen64plus-video-gliden64/src/F3DEX2.h
  38. +116 −0 jni/mupen64plus-video-gliden64/src/F3DEX2CBFD.cpp
  39. +8 −0 jni/mupen64plus-video-gliden64/src/F3DEX2CBFD.h
  40. +60 −0 jni/mupen64plus-video-gliden64/src/F3DPD.cpp
  41. +8 −0 jni/mupen64plus-video-gliden64/src/F3DPD.h
  42. +68 −0 jni/mupen64plus-video-gliden64/src/F3DSWSE.cpp
  43. +7 −0 jni/mupen64plus-video-gliden64/src/F3DSWSE.h
  44. +73 −0 jni/mupen64plus-video-gliden64/src/F3DWRUS.cpp
  45. +8 −0 jni/mupen64plus-video-gliden64/src/F3DWRUS.h
  46. +1,345 −0 jni/mupen64plus-video-gliden64/src/FrameBuffer.cpp
  47. +115 −0 jni/mupen64plus-video-gliden64/src/FrameBuffer.h
  48. +100 −0 jni/mupen64plus-video-gliden64/src/FrameBufferEmulationIssues.txt
  49. +310 −0 jni/mupen64plus-video-gliden64/src/GBI.cpp
  50. +752 −0 jni/mupen64plus-video-gliden64/src/GBI.h
  51. +541 −0 jni/mupen64plus-video-gliden64/src/GLES2/GLSLCombiner_gles2.cpp
  52. +388 −0 jni/mupen64plus-video-gliden64/src/GLES2/Shaders_gles2.h
  53. +149 −0 jni/mupen64plus-video-gliden64/src/GLES2/UniformSet.cpp
  54. +71 −0 jni/mupen64plus-video-gliden64/src/GLES2/UniformSet.h
  55. +130 −0 jni/mupen64plus-video-gliden64/src/GLSLCombiner.h
  56. +3 −0 jni/mupen64plus-video-gliden64/src/GLideN64.cpp
  57. +8 −0 jni/mupen64plus-video-gliden64/src/GLideN64.h
  58. +141 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/CMakeLists.txt
  59. +172 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/Ext_TxFilter.cpp
  60. +247 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/Ext_TxFilter.h
  61. +79 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/GlideHQ.rc
  62. +94 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/README.txt
  63. +727 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters.cpp
  64. +82 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters.h
  65. +155 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_2xsai.cpp
  66. +145 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_2xsai.h
  67. +1,510 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq2x.cpp
  68. +1,847 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq2x.h
  69. +835 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq4x.cpp
  70. +4,999 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_hq4x.h
  71. +1,307 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_lq2x.h
  72. +1,267 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_xbrz.cpp
  73. +107 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TextureFilters_xbrz.h
  74. +427 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxCache.cpp
  75. +68 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxCache.h
  76. +100 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxDbg.cpp
  77. +61 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxDbg.h
  78. +623 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilter.cpp
  79. +81 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilter.h
  80. +106 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilterExport.cpp
  81. +766 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxHiResCache.cpp
  82. +60 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxHiResCache.h
  83. +729 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxImage.cpp
  84. +115 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxImage.h
  85. +63 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxInternal.h
  86. +980 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxQuantize.cpp
  87. +69 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxQuantize.h
  88. +361 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxReSample.cpp
  89. +45 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxReSample.h
  90. +80 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxTexCache.cpp
  91. +39 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxTexCache.h
  92. +610 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxUtil.cpp
  93. +76 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxUtil.h
  94. +27 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/bldno.cpp
  95. +2 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/bldno.h
  96. +339 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/gpl-2.0.txt
  97. +3,282 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/png.h
  98. +644 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/pngconf.h
  99. +210 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/pnglibconf.h
  100. +489 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/pngstruct.h
  101. +511 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/zconf.h
  102. +1,768 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/inc/zlib.h
  103. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/libpng.lib
  104. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/libpngd.lib
  105. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/zlib.lib
  106. BIN jni/mupen64plus-video-gliden64/src/GLideNHQ/lib/zlibd.lib
  107. +59 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/osal/osal_files.h
  108. +138 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/osal/osal_files_unix.c
  109. +154 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/osal/osal_files_win32.c
  110. +118 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/osal/txWidestringWrapper.cpp
  111. +61 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/osal/txWidestringWrapper.h
  112. +33 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/CMakeLists.txt
  113. +70 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/Makefile.gcc
  114. +68 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/Makefile.vc8
  115. +120 −0 jni/mupen64plus-video-gliden64/src/GLideNHQ/test/test.cpp
  116. +14 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.cpp
  117. +22 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.h
  118. +537 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/AboutDialog.ui
  119. +429 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ConfigDialog.cpp
  120. +47 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ConfigDialog.h
  121. +14 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/FullscreenResolutions.h
  122. +93 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.cpp
  123. +26 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.h
  124. +42 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.pro
  125. +25 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.sln
  126. +248 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.vcxproj
  127. +135 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/GLideNUI.vcxproj.filters
  128. BIN jni/mupen64plus-video-gliden64/src/GLideNUI/Icon.png
  129. +35 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ScreenShot.cpp
  130. +241 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/Settings.cpp
  131. +10 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/Settings.h
  132. +1,380 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/configDialog.ui
  133. +123 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/fullscreenresolutions_windows.cpp
  134. +5 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/icon.qrc
  135. +125 −0 jni/mupen64plus-video-gliden64/src/Keys.cpp
  136. +95 −0 jni/mupen64plus-video-gliden64/src/Keys.h
  137. +58 −0 jni/mupen64plus-video-gliden64/src/L3D.cpp
  138. +10 −0 jni/mupen64plus-video-gliden64/src/L3D.h
  139. +62 −0 jni/mupen64plus-video-gliden64/src/L3DEX.cpp
  140. +8 −0 jni/mupen64plus-video-gliden64/src/L3DEX.h
  141. +62 −0 jni/mupen64plus-video-gliden64/src/L3DEX2.cpp
  142. +10 −0 jni/mupen64plus-video-gliden64/src/L3DEX2.h
  143. +43 −0 jni/mupen64plus-video-gliden64/src/Log.h
  144. +61 −0 jni/mupen64plus-video-gliden64/src/MupenPlusPluginAPI.cpp
  145. +13 −0 jni/mupen64plus-video-gliden64/src/N64.cpp
  146. +53 −0 jni/mupen64plus-video-gliden64/src/N64.h
  147. +761 −0 jni/mupen64plus-video-gliden64/src/OGL3X/GLSLCombiner_ogl3x.cpp
  148. +621 −0 jni/mupen64plus-video-gliden64/src/OGL3X/Shaders_ogl3x.h
  149. +246 −0 jni/mupen64plus-video-gliden64/src/OGL3X/UniformBlock.cpp
  150. +76 −0 jni/mupen64plus-video-gliden64/src/OGL3X/UniformBlock.h
  151. +1,400 −0 jni/mupen64plus-video-gliden64/src/OpenGL.cpp
  152. +249 −0 jni/mupen64plus-video-gliden64/src/OpenGL.h
  153. +111 −0 jni/mupen64plus-video-gliden64/src/PluginAPI.h
  154. +487 −0 jni/mupen64plus-video-gliden64/src/PostProcessor.cpp
  155. +39 −0 jni/mupen64plus-video-gliden64/src/PostProcessor.h
  156. +604 −0 jni/mupen64plus-video-gliden64/src/RDP.cpp
  157. +24 −0 jni/mupen64plus-video-gliden64/src/RDP.h
  158. +335 −0 jni/mupen64plus-video-gliden64/src/RSP.cpp
  159. +26 −0 jni/mupen64plus-video-gliden64/src/RSP.h
  160. +1 −0 jni/mupen64plus-video-gliden64/src/Revision.h
  161. +113 −0 jni/mupen64plus-video-gliden64/src/S2DEX.cpp
  162. +204 −0 jni/mupen64plus-video-gliden64/src/S2DEX.h
  163. +44 −0 jni/mupen64plus-video-gliden64/src/S2DEX2.cpp
  164. +19 −0 jni/mupen64plus-video-gliden64/src/S2DEX2.h
  165. +258 −0 jni/mupen64plus-video-gliden64/src/ShaderUtils.cpp
  166. +12 −0 jni/mupen64plus-video-gliden64/src/ShaderUtils.h
  167. +361 −0 jni/mupen64plus-video-gliden64/src/TextDrawer.cpp
  168. +21 −0 jni/mupen64plus-video-gliden64/src/TextDrawer.h
  169. +11 −0 jni/mupen64plus-video-gliden64/src/TextDrawerStub.cpp
  170. +1,447 −0 jni/mupen64plus-video-gliden64/src/Textures.cpp
  171. +123 −0 jni/mupen64plus-video-gliden64/src/Textures.h
  172. +151 −0 jni/mupen64plus-video-gliden64/src/Turbo3D.cpp
  173. +6 −0 jni/mupen64plus-video-gliden64/src/Turbo3D.h
  174. +44 −0 jni/mupen64plus-video-gliden64/src/TxFilterStub.cpp
  175. +43 −0 jni/mupen64plus-video-gliden64/src/Types.h
  176. +47 −0 jni/mupen64plus-video-gliden64/src/UniformCollection.h
  177. +173 −0 jni/mupen64plus-video-gliden64/src/VI.cpp
  178. +25 −0 jni/mupen64plus-video-gliden64/src/VI.h
  179. +643 −0 jni/mupen64plus-video-gliden64/src/ZSort.cpp
  180. +6 −0 jni/mupen64plus-video-gliden64/src/ZSort.h
  181. +283 −0 jni/mupen64plus-video-gliden64/src/ZilmarGFX_1_3.h
  182. +51 −0 jni/mupen64plus-video-gliden64/src/ZilmarPluginAPI.cpp
  183. +191 −0 jni/mupen64plus-video-gliden64/src/common/CommonAPIImpl_common.cpp
  184. +587 −0 jni/mupen64plus-video-gliden64/src/convert.h
  185. +1,286 −0 jni/mupen64plus-video-gliden64/src/gDP.cpp
  186. +292 −0 jni/mupen64plus-video-gliden64/src/gDP.h
  187. +2,442 −0 jni/mupen64plus-video-gliden64/src/gSP.cpp
  188. +210 −0 jni/mupen64plus-video-gliden64/src/gSP.h
  189. +3 −0 jni/mupen64plus-video-gliden64/src/getRevision.sh
  190. +45 −0 jni/mupen64plus-video-gliden64/src/glState.cpp
  191. +327 −0 jni/mupen64plus-video-gliden64/src/glState.h
  192. +39 −0 jni/mupen64plus-video-gliden64/src/inc/callbacks.h
  193. +30 −0 jni/mupen64plus-video-gliden64/src/inc/config.h
  194. +46 −0 jni/mupen64plus-video-gliden64/src/inc/debugger.h
  195. +13,142 −0 jni/mupen64plus-video-gliden64/src/inc/glext.h
  196. +90 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_common.h
  197. +252 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_config.h
  198. +202 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_debugger.h
  199. +141 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_frontend.h
  200. +273 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_plugin.h
  201. +366 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_types.h
  202. +154 −0 jni/mupen64plus-video-gliden64/src/inc/m64p_vidext.h
  203. +38 −0 jni/mupen64plus-video-gliden64/src/inc/vidext.h
  204. +486 −0 jni/mupen64plus-video-gliden64/src/inc/vidext_sdl2_compat.h
  205. +72 −0 jni/mupen64plus-video-gliden64/src/mupenplus/CommonAPIImpl_mupenplus.cpp
  206. +221 −0 jni/mupen64plus-video-gliden64/src/mupenplus/Config_mupenplus.cpp
  207. +49 −0 jni/mupen64plus-video-gliden64/src/mupenplus/GLideN64_mupenplus.h
  208. +130 −0 jni/mupen64plus-video-gliden64/src/mupenplus/MupenPlusAPIImpl.cpp
  209. +152 −0 jni/mupen64plus-video-gliden64/src/mupenplus/OpenGL_mupenplus.cpp
  210. +22 −0 jni/mupen64plus-video-gliden64/src/mupenplus/video_api_export.ver
  211. +783 −0 jni/mupen64plus-video-gliden64/src/sdl2_compat.h
  212. +52 −0 jni/mupen64plus-video-gliden64/src/windows/CommonAPIImpl_windows.cpp
  213. +32 −0 jni/mupen64plus-video-gliden64/src/windows/Config_windows.cpp
  214. +69 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions.h
  215. +137 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions_windows.cpp
  216. +14 −0 jni/mupen64plus-video-gliden64/src/windows/GLideN64_windows.cpp
  217. +11 −0 jni/mupen64plus-video-gliden64/src/windows/GLideN64_windows.h
  218. +223 −0 jni/mupen64plus-video-gliden64/src/windows/OpenGL_windows.cpp
  219. +39 −0 jni/mupen64plus-video-gliden64/src/windows/ZilmarAPIImpl_windows.cpp
  220. +127 −0 jni/mupen64plus-video-gliden64/src/winlnxdefs.h
  221. +41 −0 jni/mupen64plus-video-gliden64/src/wst.h
  222. +48 −0 jni/mupen64plus-video-glidenhq.mk
  223. +16 −0 res/values/arrays.xml
  224. +7 −0 res/values/strings.xml
  225. +166 −0 res/xml/profile_emulation.xml
  226. +1 −1 src/paulscode/android/mupen64plusae/SplashActivity.java
  227. +43 −0 src/paulscode/android/mupen64plusae/jni/NativeConfigFiles.java
  228. +16 −13 src/paulscode/android/mupen64plusae/persistent/AppData.java
  229. +5 −1 src/paulscode/android/mupen64plusae/persistent/GamePrefs.java
  230. +37 −0 src/paulscode/android/mupen64plusae/profile/EmulationProfileActivity.java
  231. +16 −0 src/paulscode/android/mupen64plusae/util/Plugin.java
  232. +133 −0 tools/pull-gliden64.sh
@@ -10,6 +10,31 @@ r4300Emulator=2
videoPlugin=libmupen64plus-video-glide64mk2.so
glide64Frameskip=-5
[GlideN64-GLES-2.0]
comment=gliden64 video with recommended settings for most older devices
r4300Emulator=2
videoPlugin=libmupen64plus-video-gliden64%1$s.so
videoSubPlugin=-gles20
MultiSampling=0
EnableLOD=False
EnableCopyColorToRDRAM=False
EnableCopyDepthToRDRAM=False
EnableN64DepthCompare=False
[GlideN64-GLES-3.0]
comment=gliden64 video with recommended settings for Android 4.3+ devices with OpenGL ES 3.0 support
r4300Emulator=2
videoPlugin=libmupen64plus-video-gliden64%1$s.so
videoSubPlugin=-gles30
MultiSampling=0
EnableN64DepthCompare=False
[GlideN64-GLES-3.1]
comment=gliden64 video with recommended settings for Android 5.0+ devices with OpenGL ES 3.1 support
r4300Emulator=2
videoPlugin=libmupen64plus-video-gliden64%1$s.so
videoSubPlugin=-gles31
[Gln64-Accurate]
comment=gln64 video with recommended settings for quality
r4300Emulator=2
View
@@ -31,6 +31,8 @@ include $(JNI_LOCAL_PATH)/mupen64plus-input-android/Android.mk
include $(JNI_LOCAL_PATH)/xperia-touchpad/Android.mk
include $(JNI_LOCAL_PATH)/mupen64plus-rsp-hle.mk
include $(JNI_LOCAL_PATH)/mupen64plus-ui-console.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-glidenhq.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-gliden64.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-glide64mk2.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-gln64/Android.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-rice.mk
@@ -0,0 +1,164 @@
#############################
# mupen64plus-video-gliden64
#############################
include $(CLEAR_VARS)
LOCAL_PATH := $(JNI_LOCAL_PATH)
SRCDIR := ./mupen64plus-video-gliden64/src
MY_LOCAL_MODULE := mupen64plus-video-gliden64
MY_LOCAL_SHARED_LIBRARIES := freetype
MY_LOCAL_STATIC_LIBRARIES := glidenhq
MY_LOCAL_ARM_MODE := arm
MY_LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(SRCDIR) \
$(M64P_API_INCLUDES) \
$(SDL_INCLUDES) \
$(FREETYPE_INCLUDES) \
MY_LOCAL_SRC_FILES := \
$(SRCDIR)/3DMath.cpp \
$(SRCDIR)/Combiner.cpp \
$(SRCDIR)/CommonPluginAPI.cpp \
$(SRCDIR)/Config.cpp \
$(SRCDIR)/CRC.cpp \
$(SRCDIR)/DepthBuffer.cpp \
$(SRCDIR)/F3D.cpp \
$(SRCDIR)/F3DDKR.cpp \
$(SRCDIR)/F3DEX2CBFD.cpp \
$(SRCDIR)/F3DEX2.cpp \
$(SRCDIR)/F3DEX.cpp \
$(SRCDIR)/F3DPD.cpp \
$(SRCDIR)/F3DSWSE.cpp \
$(SRCDIR)/F3DWRUS.cpp \
$(SRCDIR)/FrameBuffer.cpp \
$(SRCDIR)/GBI.cpp \
$(SRCDIR)/gDP.cpp \
$(SRCDIR)/GLideN64.cpp \
$(SRCDIR)/glState.cpp \
$(SRCDIR)/gSP.cpp \
$(SRCDIR)/Keys.cpp \
$(SRCDIR)/L3D.cpp \
$(SRCDIR)/L3DEX2.cpp \
$(SRCDIR)/L3DEX.cpp \
$(SRCDIR)/MupenPlusPluginAPI.cpp \
$(SRCDIR)/N64.cpp \
$(SRCDIR)/OpenGL.cpp \
$(SRCDIR)/PostProcessor.cpp \
$(SRCDIR)/RDP.cpp \
$(SRCDIR)/RSP.cpp \
$(SRCDIR)/S2DEX2.cpp \
$(SRCDIR)/S2DEX.cpp \
$(SRCDIR)/Textures.cpp \
$(SRCDIR)/Turbo3D.cpp \
$(SRCDIR)/VI.cpp \
$(SRCDIR)/ZSort.cpp \
$(SRCDIR)/ShaderUtils.cpp \
$(SRCDIR)/common/CommonAPIImpl_common.cpp \
$(SRCDIR)/mupenplus/CommonAPIImpl_mupenplus.cpp \
$(SRCDIR)/mupenplus/Config_mupenplus.cpp \
$(SRCDIR)/mupenplus/MupenPlusAPIImpl.cpp \
$(SRCDIR)/mupenplus/OpenGL_mupenplus.cpp \
$(SRCDIR)/TextDrawer.cpp \
MY_LOCAL_CFLAGS := \
$(COMMON_CFLAGS) \
-g \
-DTXFILTER_LIB \
-DANDROID \
-DUSE_SDL \
-DMUPENPLUSAPI \
-fsigned-char \
#-DSDL_NO_COMPAT \
MY_LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -g
MY_LOCAL_LDFLAGS := -Wl,-version-script,$(LOCAL_PATH)/$(SRCDIR)/mupenplus/video_api_export.ver
MY_LOCAL_LDLIBS := -llog
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
# Use for ARM7a:
#MY_LOCAL_SRC_FILES += gSPNeon.cpp.neon
#MY_LOCAL_SRC_FILES += 3DMathNeon.cpp.neon
MY_LOCAL_CFLAGS += -DARM_ASM
MY_LOCAL_CFLAGS += -D__NEON_OPT
else ifeq ($(TARGET_ARCH_ABI), armeabi)
# Use for pre-ARM7a:
else ifeq ($(TARGET_ARCH_ABI), x86)
# TODO: set the proper flags here
else
# Any other architectures that Android could be running on?
endif
###########
# gles 2.0
###########
include $(CLEAR_VARS)
LOCAL_MODULE := $(MY_LOCAL_MODULE)-gles20
LOCAL_SHARED_LIBRARIES := $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := $(MY_LOCAL_STATIC_LIBRARIES)
LOCAL_ARM_MODE := $(MY_LOCAL_ARM_MODE)
LOCAL_C_INCLUDES := $(MY_LOCAL_C_INCLUDES)
LOCAL_SRC_FILES := $(MY_LOCAL_SRC_FILES) $(SRCDIR)/GLES2/UniformSet.cpp $(SRCDIR)/GLES2/GLSLCombiner_gles2.cpp
LOCAL_CFLAGS := $(MY_LOCAL_CFLAGS) -DGLES2
LOCAL_CPPFLAGS := $(MY_LOCAL_CPPFLAGS)
LOCAL_LDFLAGS := $(MY_LOCAL_LDFLAGS)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -lGLESv2
include $(BUILD_SHARED_LIBRARY)
###########
# gles 3.0
###########
include $(CLEAR_VARS)
LOCAL_MODULE := $(MY_LOCAL_MODULE)-gles30
LOCAL_SHARED_LIBRARIES := $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := $(MY_LOCAL_STATIC_LIBRARIES)
LOCAL_ARM_MODE := $(MY_LOCAL_ARM_MODE)
LOCAL_C_INCLUDES := $(MY_LOCAL_C_INCLUDES) $(LOCAL_PATH)/GLES3/include/
LOCAL_SRC_FILES := $(MY_LOCAL_SRC_FILES) $(SRCDIR)/OGL3X/UniformBlock.cpp $(SRCDIR)/OGL3X/GLSLCombiner_ogl3x.cpp
LOCAL_CFLAGS := $(MY_LOCAL_CFLAGS) -DGLES3
LOCAL_CPPFLAGS := $(MY_LOCAL_CPPFLAGS)
LOCAL_LDFLAGS := $(MY_LOCAL_LDFLAGS)
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/arm/ -lGLESv3
else ifeq ($(TARGET_ARCH_ABI), armeabi)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/arm/ -lGLESv3
else ifeq ($(TARGET_ARCH_ABI), x86)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/x86/ -lGLESv3
else
# Any other architectures that Android could be running on?
endif
include $(BUILD_SHARED_LIBRARY)
###########
# gles 3.1
###########
include $(CLEAR_VARS)
LOCAL_MODULE := $(MY_LOCAL_MODULE)-gles31
LOCAL_SHARED_LIBRARIES := $(MY_LOCAL_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := $(MY_LOCAL_STATIC_LIBRARIES)
LOCAL_ARM_MODE := $(MY_LOCAL_ARM_MODE)
LOCAL_C_INCLUDES := $(MY_LOCAL_C_INCLUDES) $(LOCAL_PATH)/GLES3/include/
LOCAL_SRC_FILES := $(MY_LOCAL_SRC_FILES) $(SRCDIR)/OGL3X/UniformBlock.cpp $(SRCDIR)/OGL3X/GLSLCombiner_ogl3x.cpp
LOCAL_CFLAGS := $(MY_LOCAL_CFLAGS) -DGLES3_1
LOCAL_CPPFLAGS := $(MY_LOCAL_CPPFLAGS)
LOCAL_LDFLAGS := $(MY_LOCAL_LDFLAGS)
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/arm/ -lGLESv3
else ifeq ($(TARGET_ARCH_ABI), armeabi)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/arm/ -lGLESv3
else ifeq ($(TARGET_ARCH_ABI), x86)
LOCAL_LDLIBS := $(MY_LOCAL_LDLIBS) -L$(LOCAL_PATH)/GLES3/lib/x86/ -lGLESv3
else
# Any other architectures that Android could be running on?
endif
include $(BUILD_SHARED_LIBRARY)
@@ -1 +1,9 @@
*
backup/
Debug*/
Release*/
build*/
Roms/
*.ncb
*.suo
*.sdf
*.user
Oops, something went wrong.

0 comments on commit 8edc767

Please sign in to comment.