Merge pull request #1482 from rishooty/amd64mupencores

mupen refactor 2 electric bogaloo

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-audio-sdl/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-  
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"
   export SDL_LDLIBS="-lSDL2_net -lSDL2"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-cxd4/package.mk

@@ -26,12 +26,6 @@ PKG_MAKE_OPTS_TARGET+="HLEVIDEO=1"
 # fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
@@ -39,6 +33,9 @@ make_target() {
       export USE_GLES=1
       CPPFLAGS="-DUSE_SSE2NEON"
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-hle/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-ui-console/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-glide64mk2/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk

@@ -19,12 +19,6 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
@@ -32,6 +26,9 @@ make_target() {
       export USE_GLES=1
       PKG_MAKE_OPTS_TARGET+="-DNOHQ=On -DCRC_ARMV8=On -DEGL=On -DNEON_OPT=On"
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-rice/package.mk

@@ -20,18 +20,15 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi
 
 make_target() {
-  case ${DEVICE} in
-    AMD64)
-      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
-    ;;
-  esac
-
   case ${ARCH} in
     arm|aarch64)
       export HOST_CPU=aarch64
       BINUTILS="$(get_build_dir binutils)/.aarch64-libreelec-linux-gnueabi"
       export USE_GLES=1
     ;;
+    x86_64)
+      PKG_MAKE_OPTS_TARGET+="USE_GLES=0"
+    ;;
   esac
   export APIDIR=$(get_build_dir mupen64plus-sa-core)/.install_pkg/usr/local/include/mupen64plus
   export SDL_CFLAGS="-I${SYSROOT_PREFIX}/usr/include/SDL2 -pthread"