Remove Android makefile and use CMakeLists for Android instead

2024-07-02 09:03:37 +00:00 · 2019-11-30 17:21:04 -05:00 · 2019-11-30 17:21:04 -05:00 · cda2dcf2a3
commit cda2dcf2a3
parent 028133bb5c
5 changed files with 127 additions and 293 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -10,6 +10,16 @@ option(ODROID "Set to ON if targeting an Odroid" ${ODROID})
 option(MUPENPLUSAPI "Set to ON for Mupen64Plus plugin" ${MUPENPLUSAPI})
 option(MESA "Set to ON to disable Raspberry Pi autodetection" ${MESA})
 option(VERO4K "Set to ON if targeting a Vero4k" ${VERO4K})
+option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
+option(GL_PROFILE "Set to ON to turn on GL profiling" ${GL_PROFILE})
+
+# run script to generate Revision.h
+set(PATH_REVISION "Revision.h")
+add_custom_command(
+        OUTPUT ${PATH_REVISION}
+        COMMAND ${CMAKE_SOURCE_DIR}/getRevision.sh
+        COMMENT "Generate Git version"
+)

 project( GLideN64 )

@ -248,12 +258,73 @@ if(VERO4K)
   )
 endif(VERO4K)

-if(UNIX OR BCMHOST)
-  SET( FREETYPE_INCLUDE_DIRS "/usr/include/freetype2/" )
+if(ANDROID)
+   add_definitions(-DOS_ANDROID -DEGL_EGLEXT_PROTOTYPES -DEGL)
+   set(EGL ON)
+
+   if(ANDROID_ABI STREQUAL "armeabi-v7a" OR ANDROID_ABI STREQUAL "arm64-v8a")
+       set(NEON_OPT ON)
+       set(VEC4_OPT ON)
+       set(CRC_NEON ON)
+   elseif(ANDROID_ABI STREQUAL "x86" OR ANDROID_ABI STREQUAL "x86_64")
+       set(CRC_OPT ON)
+       set(VEC4_OPT ON)
+   endif()
+
+   list(APPEND GLideN64_SOURCES
+           Log_android.cpp
+           Graphics/OpenGLContext/opengl_ColorBufferReaderWithEGLImage.cpp
+           Graphics/OpenGLContext/GraphicBuffer/PrivateApi/GraphicBuffer.cpp
+           Graphics/OpenGLContext/GraphicBuffer/PrivateApi/libhardware.cpp
+           Graphics/OpenGLContext/GraphicBuffer/PublicApi/android_hardware_buffer_compat.cpp
+           Graphics/OpenGLContext/GraphicBuffer/GraphicBufferWrapper.cpp
+           )
+
+   list(REMOVE_ITEM GLideN64_SOURCES
+           Log.cpp
+           )
+
+   find_library( # Defines the name of the path variable that stores the
+           # location of the NDK library.
+           LOG_LIB
+
+           # Specifies the name of the NDK library that
+           # CMake needs to locate.
+           log )
+endif(ANDROID)
+
+if(ANDROID)
+  set( FREETYPE_INCLUDE_DIRS "${ANDROID_LIB_PATH}/freetype/include" )
+elseif(UNIX OR BCMHOST)
+  set( FREETYPE_INCLUDE_DIRS "/usr/include/freetype2/" )
 else(UNIX OR BCMHOST)
-  SET( ENV{FREETYPE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../freetype )
-endif(UNIX OR BCMHOST)
-FIND_PACKAGE( Freetype REQUIRED )
+  set( ENV{FREETYPE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../freetype )
+endif(ANDROID)
+
+if(ANDROID)
+    add_library( ANDROID_FREETYPE
+            SHARED
+            IMPORTED )
+
+    if( CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set( BUILD_VARIANT "debug" )
+    else()
+        set( BUILD_VARIANT "release" )
+    endif()
+
+    set_target_properties( # Specifies the target library.
+            ANDROID_FREETYPE
+
+            # Specifies the parameter you want to define.
+            PROPERTIES IMPORTED_LOCATION
+
+            # Provides the path to the library you want to import.
+            ${ANDROID_LIB_PATH}/libs/${BUILD_VARIANT}/${ANDROID_ABI}/libfreetype.so)
+    set(FREETYPE_LIBRARIES ANDROID_FREETYPE)
+else(ANDROID)
+    FIND_PACKAGE( Freetype REQUIRED )
+endif(ANDROID)
+
 include_directories( ${FREETYPE_INCLUDE_DIRS} )

 if(VEC4_OPT)
@ -271,11 +342,19 @@ if(CRC_ARMV8)
  )
 elseif(CRC_OPT)
  list(REMOVE_ITEM GLideN64_SOURCES
-        CRC32.cpp
+    CRC32.cpp
  )
  list(APPEND GLideN64_SOURCES
-        CRC_OPT.cpp
-        xxHash/xxhash.c
+    CRC_OPT.cpp
+    xxHash/xxhash.c
+  )
+elseif(CRC_NEON)
+  list(REMOVE_ITEM GLideN64_SOURCES
+    CRC32.cpp
+  )
+  list(APPEND GLideN64_SOURCES
+    Neon/CRC_OPT_NEON.cpp
+    xxHash/xxhash.c
  )
 endif(CRC_ARMV8)

@ -317,11 +396,17 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug")
 	)
 endif( CMAKE_BUILD_TYPE STREQUAL "Debug")

+if(GL_PROFILE)
+    add_definitions(
+            -DGL_PROFILE -DGL_DEBUG
+    )
+endif(GL_PROFILE)
+
 if(EGL)
  add_definitions(
    -DEGL
  )
-  SET(OPENGL_LIBRARIES ${EGL_LIB})
+  set(OPENGL_LIBRARIES ${EGL_LIB})
 else(EGL)
  find_package(OpenGL REQUIRED)
  include_directories(${OpenGL_INCLUDE_DIRS})
@ -342,15 +427,15 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ
    message("Found compiler version " ${G++_VERSION})
    message(SEND_ERROR "You need at least Clang 3.3 to compile GLideN64!")
  endif()
-  SET(GCC_CPP11_COMPILE_FLAGS "-std=c++11")
-  SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_CPP11_COMPILE_FLAGS}" )
+  set(GCC_CPP11_COMPILE_FLAGS "-std=c++11")
+  set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_CPP11_COMPILE_FLAGS}" )
  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    SET(GCC_STATIC_LINK_FLAGS "-static-libgcc")
+    set(GCC_STATIC_LINK_FLAGS "-static-libgcc")
  endif()
-  SET( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_STATIC_LINK_FLAGS}" )
+  set( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_STATIC_LINK_FLAGS}" )
 endif()

-add_library( ${GLideN64_DLL_NAME} SHARED ${GLideN64_SOURCES})
+add_library( ${GLideN64_DLL_NAME} SHARED ${GLideN64_SOURCES} ${PATH_REVISION})

 if( CMAKE_BUILD_TYPE STREQUAL "Debug")
  SET_TARGET_PROPERTIES(
@ -363,15 +448,15 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug")

  if(SDL)
        if (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osald )
+	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osald )
 	else (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osald GLideNHQd )
+	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osald GLideNHQd )
 	endif (NOHQ)
  else(SDL)
 	if (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osald )
+	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osald )
 	else (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osald GLideNHQd )
+	  target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osald GLideNHQd )
 	endif (NOHQ)
  endif(SDL)
 endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -396,15 +481,15 @@ if( CMAKE_BUILD_TYPE STREQUAL "Release")

  if(SDL)
 	if (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osal )
+	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osal )
 	else (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osal GLideNHQ )
+	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osal GLideNHQ )
 	endif (NOHQ)
  else(SDL)
 	if (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osal )
+	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osal )
 	else (NOHQ)
-	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osal GLideNHQ )
+	  target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LOG_LIB} osal GLideNHQ )
 	endif (NOHQ)
  endif(SDL)
 endif( CMAKE_BUILD_TYPE STREQUAL "Release")
--- a/src/GLideNHQ/CMakeLists.txt
+++ b/src/GLideNHQ/CMakeLists.txt
@ -86,6 +86,12 @@ if( NOT GHQCHK )

    add_definitions( -DTXFILTER_LIB)

+    if( CMAKE_BUILD_TYPE STREQUAL "Debug")
+        SET( BUILD_VARIANT "debug" )
+    else()
+        SET( BUILD_VARIANT "release" )
+    endif()
+
    if( CMAKE_BUILD_TYPE STREQUAL "Debug")
      add_library( GLideNHQd STATIC ${GLideNHQ_SOURCES})

@ -100,6 +106,13 @@ if( NOT GHQCHK )
          ${ZLIB_LIBRARIES}
          osald
        )
+      elseif(ANDROID)
+          target_link_libraries(GLideNHQ PRIVATE
+                  ${ANDROID_LIB_PATH}/libs/${BUILD_VARIANT}/${ANDROID_ABI}/libpng.a
+                  z
+                  dl
+                  osal
+                  )
      else(MINGW OR BCMHOST OR APPLE OR USE_SYSTEM_LIBS)
        target_link_libraries(GLideNHQd PRIVATE
          ${CMAKE_CURRENT_SOURCE_DIR}/lib/libpng.a
@ -132,6 +145,13 @@ if( NOT GHQCHK )
          ${ZLIB_LIBRARIES}
          osal
        )
+      elseif(ANDROID)
+        target_link_libraries(GLideNHQ PRIVATE
+          ${ANDROID_LIB_PATH}/libs/${BUILD_VARIANT}/${ANDROID_ABI}/libpng.a
+          z
+          dl
+          osal
+        )
      else(PANDORA)
        target_link_libraries(GLideNHQ PRIVATE
          ${CMAKE_CURRENT_SOURCE_DIR}/lib/libpng.a
--- a/src/GLideNHQ/mupen64plus-video-glidenhq.mk
+++ b/src/GLideNHQ/mupen64plus-video-glidenhq.mk
@ -1,48 +0,0 @@
-###########
-# glidenhq
-###########
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./$(BASE_DIR)/src/GLideNHQ
-LOCAL_SHARED_LIBRARIES := osal
-LOCAL_MODULE := glidenhq
-LOCAL_STATIC_LIBRARIES := png
-LOCAL_ARM_MODE := arm
-
-LOCAL_C_INCLUDES :=                     \
-    $(LOCAL_PATH)/$(SRCDIR)             \
-    $(LOCAL_PATH)/$(SRCDIR)/..          \
-    $(LOCAL_PATH)/$(SRCDIR)/../osal     \
-    $(PNG_INCLUDES)                     \
-    $(GL_INCLUDES)
-
-LOCAL_SRC_FILES :=                          \
-    $(SRCDIR)/TextureFilters.cpp            \
-    $(SRCDIR)/TextureFilters_2xsai.cpp      \
-    $(SRCDIR)/TextureFilters_hq2x.cpp       \
-    $(SRCDIR)/TextureFilters_hq4x.cpp       \
-    $(SRCDIR)/TextureFilters_xbrz.cpp       \
-    $(SRCDIR)/TxCache.cpp                   \
-    $(SRCDIR)/TxDbg.cpp                     \
-    $(SRCDIR)/TxFilter.cpp                  \
-    $(SRCDIR)/TxFilterExport.cpp            \
-    $(SRCDIR)/TxHiResCache.cpp              \
-    $(SRCDIR)/TxImage.cpp                   \
-    $(SRCDIR)/TxQuantize.cpp                \
-    $(SRCDIR)/TxReSample.cpp                \
-    $(SRCDIR)/TxTexCache.cpp                \
-    $(SRCDIR)/TxUtil.cpp                    \
-    $(SRCDIR)/txWidestringWrapper.cpp       \
-
-LOCAL_CFLAGS :=         \
-    $(COMMON_CFLAGS)    \
-    -DOS_ANDROID        \
-    -DTXFILTER_LIB      \
-    -fsigned-char
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++17 -fexceptions \
-    -DOS_ANDROID        \
-    -DTXFILTER_LIB      \
-    -fsigned-char
-
-include $(BUILD_STATIC_LIBRARY)
--- a/src/mupen64plus-video-gliden64.mk
+++ b/src/mupen64plus-video-gliden64.mk
@ -1,195 +0,0 @@
-#############################
-# mupen64plus-video-gliden64
-#############################
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./$(BASE_DIR)/src
-
-MY_LOCAL_MODULE := mupen64plus-video-gliden64
-MY_LOCAL_SHARED_LIBRARIES := freetype osal
-MY_LOCAL_STATIC_LIBRARIES := glidenhq
-MY_LOCAL_ARM_MODE := arm
-
-MY_LOCAL_C_INCLUDES :=                          \
-    $(LOCAL_PATH)/$(SRCDIR)                     \
-    $(M64P_API_INCLUDES)                        \
-    $(SDL_INCLUDES)                             \
-    $(FREETYPE_INCLUDES)                        \
-    $(LOCAL_PATH)/$(SRCDIR)/osal                \
-    $(GL_INCLUDES)
-
-MY_LOCAL_SRC_FILES :=                                                              \
-    $(SRCDIR)/Combiner.cpp                                                         \
-    $(SRCDIR)/CombinerKey.cpp                                                      \
-    $(SRCDIR)/CommonPluginAPI.cpp                                                  \
-    $(SRCDIR)/Config.cpp                                                           \
-    $(SRCDIR)/convert.cpp                                                          \
-    $(SRCDIR)/DebugDump.cpp                                                        \
-    $(SRCDIR)/Debugger.cpp                                                         \
-    $(SRCDIR)/DepthBuffer.cpp                                                      \
-    $(SRCDIR)/DisplayWindow.cpp                                                    \
-    $(SRCDIR)/DisplayLoadProgress.cpp                                              \
-    $(SRCDIR)/FrameBuffer.cpp                                                      \
-    $(SRCDIR)/FrameBufferInfo.cpp                                                  \
-    $(SRCDIR)/GBI.cpp                                                              \
-    $(SRCDIR)/gDP.cpp                                                              \
-    $(SRCDIR)/GLideN64.cpp                                                         \
-    $(SRCDIR)/GraphicsDrawer.cpp                                                   \
-    $(SRCDIR)/gSP.cpp                                                              \
-    $(SRCDIR)/Keys.cpp                                                             \
-    $(SRCDIR)/Log_android.cpp                                                      \
-    $(SRCDIR)/MupenPlusPluginAPI.cpp                                               \
-    $(SRCDIR)/N64.cpp                                                              \
-    $(SRCDIR)/NoiseTexture.cpp                                                     \
-    $(SRCDIR)/PaletteTexture.cpp                                                   \
-    $(SRCDIR)/Performance.cpp                                                      \
-    $(SRCDIR)/PostProcessor.cpp                                                    \
-    $(SRCDIR)/RDP.cpp                                                              \
-    $(SRCDIR)/RSP.cpp                                                              \
-    $(SRCDIR)/SoftwareRender.cpp                                                   \
-    $(SRCDIR)/TexrectDrawer.cpp                                                    \
-    $(SRCDIR)/TextDrawer.cpp                                                       \
-    $(SRCDIR)/TextureFilterHandler.cpp                                             \
-    $(SRCDIR)/Textures.cpp                                                         \
-    $(SRCDIR)/VI.cpp                                                               \
-    $(SRCDIR)/ZlutTexture.cpp                                                      \
-    $(SRCDIR)/common/CommonAPIImpl_common.cpp                                      \
-    $(SRCDIR)/mupenplus/CommonAPIImpl_mupenplus.cpp                                \
-    $(SRCDIR)/mupenplus/Config_mupenplus.cpp                                       \
-    $(SRCDIR)/mupenplus/MemoryStatus_mupenplus.cpp                                 \
-    $(SRCDIR)/mupenplus/MupenPlusAPIImpl.cpp                                       \
-    $(SRCDIR)/DepthBufferRender/ClipPolygon.cpp                                    \
-    $(SRCDIR)/DepthBufferRender/DepthBufferRender.cpp                              \
-    $(SRCDIR)/BufferCopy/ColorBufferToRDRAM.cpp                                    \
-    $(SRCDIR)/BufferCopy/DepthBufferToRDRAM.cpp                                    \
-    $(SRCDIR)/BufferCopy/RDRAMtoColorBuffer.cpp                                    \
-    $(SRCDIR)/Graphics/Context.cpp                                                 \
-    $(SRCDIR)/Graphics/ColorBufferReader.cpp                                       \
-    $(SRCDIR)/Graphics/CombinerProgram.cpp                                         \
-    $(SRCDIR)/Graphics/ObjectHandle.cpp                                            \
-    $(SRCDIR)/Graphics/OpenGLContext/GLFunctions.cpp                               \
-    $(SRCDIR)/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Wrapper.cpp             \
-    $(SRCDIR)/Graphics/OpenGLContext/ThreadedOpenGl/opengl_WrappedFunctions.cpp    \
-    $(SRCDIR)/Graphics/OpenGLContext/ThreadedOpenGl/opengl_Command.cpp             \
-    $(SRCDIR)/Graphics/OpenGLContext/ThreadedOpenGl/opengl_ObjectPool.cpp          \
-    $(SRCDIR)/Graphics/OpenGLContext/ThreadedOpenGl/RingBufferPool.cpp             \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_Attributes.cpp                         \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_BufferedDrawer.cpp                     \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp    \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_CachedFunctions.cpp                    \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp   \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithReadPixels.cpp    \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithEGLImage.cpp      \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_ContextImpl.cpp                        \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_GLInfo.cpp                             \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_Parameters.cpp                         \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_TextureManipulationObjectFactory.cpp   \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_UnbufferedDrawer.cpp                   \
-    $(SRCDIR)/Graphics/OpenGLContext/opengl_Utils.cpp                              \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_CombinerInputs.cpp                  \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp          \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.cpp             \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp   \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_FXAA.cpp                            \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp                   \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp           \
-    $(SRCDIR)/Graphics/OpenGLContext/GLSL/glsl_Utils.cpp                           \
-    $(SRCDIR)/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp     \
-    $(SRCDIR)/Graphics/OpenGLContext/GraphicBuffer/PrivateApi/GraphicBuffer.cpp    \
-    $(SRCDIR)/Graphics/OpenGLContext/GraphicBuffer/PrivateApi/libhardware.cpp      \
-    $(SRCDIR)/Graphics/OpenGLContext/GraphicBuffer/PublicApi/android_hardware_buffer_compat.cpp     \
-    $(SRCDIR)/Graphics/OpenGLContext/GraphicBuffer/GraphicBufferWrapper.cpp        \
-    $(SRCDIR)/uCodes/F3D.cpp                                                       \
-    $(SRCDIR)/uCodes/F3DAM.cpp                                                     \
-    $(SRCDIR)/uCodes/F3DBETA.cpp                                                   \
-    $(SRCDIR)/uCodes/F3DDKR.cpp                                                    \
-    $(SRCDIR)/uCodes/F3DEX.cpp                                                     \
-    $(SRCDIR)/uCodes/F3DEX2.cpp                                                    \
-    $(SRCDIR)/uCodes/F3DEX2ACCLAIM.cpp                                             \
-    $(SRCDIR)/uCodes/F3DEX2CBFD.cpp                                                \
-    $(SRCDIR)/uCodes/F3DZEX2.cpp                                                   \
-    $(SRCDIR)/uCodes/F3DFLX2.cpp                                                   \
-    $(SRCDIR)/uCodes/F3DGOLDEN.cpp                                                 \
-    $(SRCDIR)/uCodes/F3DPD.cpp                                                     \
-    $(SRCDIR)/uCodes/F3DSETA.cpp                                                   \
-    $(SRCDIR)/uCodes/F5Indi_Naboo.cpp                                              \
-    $(SRCDIR)/uCodes/F5Rogue.cpp                                                    \
-    $(SRCDIR)/uCodes/F3DTEXA.cpp                                                   \
-    $(SRCDIR)/uCodes/L3D.cpp                                                       \
-    $(SRCDIR)/uCodes/L3DEX2.cpp                                                    \
-    $(SRCDIR)/uCodes/L3DEX.cpp                                                     \
-    $(SRCDIR)/uCodes/S2DEX2.cpp                                                    \
-    $(SRCDIR)/uCodes/S2DEX.cpp                                                     \
-    $(SRCDIR)/uCodes/T3DUX.cpp                                                     \
-    $(SRCDIR)/uCodes/Turbo3D.cpp                                                   \
-    $(SRCDIR)/uCodes/ZSort.cpp                                                     \
-    $(SRCDIR)/uCodes/ZSortBOSS.cpp                                                 \
-    $(SRCDIR)/xxHash/xxhash.c                                                      \
-
-MY_COMMON_FLAGS := \
-   -g                      \
-   -DTXFILTER_LIB          \
-   -DOS_ANDROID            \
-   -DMUPENPLUSAPI          \
-   -DEGL                   \
-   -DEGL_EGLEXT_PROTOTYPES \
-   -fsigned-char
-
-MY_LOCAL_CFLAGS := $(COMMON_CFLAGS) $(MY_COMMON_FLAGS)
-
-MY_LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) $(MY_COMMON_FLAGS) -std=c++17
-
-MY_LOCAL_LDFLAGS := $(COMMON_LDFLAGS) -Wl,-version-script,$(LOCAL_PATH)/$(SRCDIR)/mupenplus/video_api_export.ver
-
-MY_LOCAL_LDLIBS := -llog -lEGL
-
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    # Use for ARM7a:
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/3DMathNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp
-    MY_LOCAL_CPPFLAGS += -D__NEON_OPT
-    MY_LOCAL_CPPFLAGS += -D__VEC4_OPT -mfpu=neon
-
-else ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
-    # Use for ARM8a:
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/3DMathNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp
-    MY_LOCAL_CPPFLAGS += -D__NEON_OPT
-    MY_LOCAL_CPPFLAGS += -D__VEC4_OPT -mfpu=neon
-
-else ifeq ($(TARGET_ARCH_ABI), x86)
-#    MY_LOCAL_CPPFLAGS += -DX86_ASM
-    MY_LOCAL_CPPFLAGS += -D__VEC4_OPT
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp
-
-else ifeq ($(TARGET_ARCH_ABI), x86_64)
-#    MY_LOCAL_CPPFLAGS += -DX86_ASM
-    MY_LOCAL_CPPFLAGS += -D__VEC4_OPT
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp
-    MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp
-endif
-
-###########
-# Build library
-###########
-include $(CLEAR_VARS)
-LOCAL_MODULE            := $(MY_LOCAL_MODULE)
-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)/GL/
-LOCAL_SRC_FILES         := $(MY_LOCAL_SRC_FILES)
-LOCAL_CFLAGS            := $(MY_LOCAL_CFLAGS)
-LOCAL_CPPFLAGS          := $(MY_LOCAL_CPPFLAGS)
-LOCAL_LDFLAGS           := $(MY_LOCAL_LDFLAGS)
-LOCAL_LDLIBS            := $(MY_LOCAL_LDLIBS)
-
-include $(BUILD_SHARED_LIBRARY)
--- a/src/osal/mupen64plus-video-osal.mk
+++ b/src/osal/mupen64plus-video-osal.mk
@ -1,28 +0,0 @@
-###########
-# osal
-###########
-include $(CLEAR_VARS)
-LOCAL_PATH := $(JNI_LOCAL_PATH)
-SRCDIR := ./$(BASE_DIR)/src/osal
-
-LOCAL_MODULE := osal
-LOCAL_ARM_MODE := arm
-
-LOCAL_C_INCLUDES :=                     \
-    $(LOCAL_PATH)/$(SRCDIR)             \
-
-LOCAL_SRC_FILES :=                          \
-    $(SRCDIR)/osal_files_unix.c        \
-
-LOCAL_CFLAGS :=         \
-    $(COMMON_CFLAGS)    \
-    -g                  \
-    -DOS_ANDROID           \
-    -fsigned-char       \
-    #-DDEBUG             \
-    #-DSDL_NO_COMPAT     \
-
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -g -fexceptions
-LOCAL_LDFLAGS := $(COMMON_LDFLAGS)
-
-include $(BUILD_SHARED_LIBRARY)