build

diff --git a/source/front-end/projects/unix/Makefile b/source/front-end/projects/unix/Makefile
index 1948d08..9bff5b3 100755 (executable)
--- a/source/front-end/projects/unix/Makefile
+++ b/source/front-end/projects/unix/Makefile
@@ -84,7 +84,9 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
   ifeq ("$(filter arm%b,$(HOST_CPU))","")
     CPU := ARM
     ARCH_DETECTED := 32BITS
-    CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ffast-math
+    #CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8
+    CFLAGS += -mcpu=native -mtune=native -marm -mfpu=neon
+    CFLAGS += -fsigned-char -ffast-math
 #    CFLAGS += -DANDROID
 #    CFLAGS += -DPAULSCODE 
     $(warning Architecture "$(HOST_CPU)" not officially supported.')

diff --git a/source/gles2n64/Makefile b/source/gles2n64/Makefile
index 3048cfa..136a2ac 100755 (executable)
--- a/source/gles2n64/Makefile
+++ b/source/gles2n64/Makefile
@@ -1,6 +1,8 @@
 PIC ?= 1
 NO_ASM := 1
-CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -DNO_ASM -DPAULSCODE -Ofast -ffast-math -fno-strict-aliasing
+#CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8
+CFLAGS += -fsigned-char -DNO_ASM -DPAULSCODE -Ofast -ffast-math -fno-strict-aliasing
+CFLAGS += -mcpu=native -mtune=native -marm -mfpu=neon
 CFLAGS += -I ../mupen64plus-core/src/api/
 CFLAGS += `sdl-config --cflags`
 

diff --git a/source/gles2rice/projects/unix/Makefile b/source/gles2rice/projects/unix/Makefile
index f2c1a61..65c22c1 100755 (executable)
--- a/source/gles2rice/projects/unix/Makefile
+++ b/source/gles2rice/projects/unix/Makefile
@@ -111,10 +111,12 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
     ARCH_DETECTED := 32BITS
     PIC ?= 1
     NO_ASM := 1
-    CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ffast-math
+    #CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ffast-math
+    CFLAGS += -fsigned-char -ffast-math
+    CFLAGS += -mcpu=native -mtune=native -marm -mfpu=neon
     CFLAGS += -DANDROID
     CFLAGS += -DPAULSCODE 
-    $(warning Architecture "$(HOST_CPU)" not officially supported.')
+    # $(warning Architecture "$(HOST_CPU)" not officially supported.')
   endif
 endif
 ifeq ("$(CPU)","NONE")

diff --git a/source/gles2rice/src/osal_opengl.h b/source/gles2rice/src/osal_opengl.h
index dd77e67..3a7a78d 100755 (executable)
--- a/source/gles2rice/src/osal_opengl.h
+++ b/source/gles2rice/src/osal_opengl.h
@@ -39,7 +39,10 @@
 
 
 #elif SDL_VIDEO_OPENGL_ES2
-#include <SDL_opengles2.h>
+//#include <SDL_opengles2.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
 #define GLSL_VERSION "100"
 
 // Extension names

diff --git a/source/mupen64plus-core/projects/unix/Makefile b/source/mupen64plus-core/projects/unix/Makefile
index 40ab0da..86bdf04 100755 (executable)
--- a/source/mupen64plus-core/projects/unix/Makefile
+++ b/source/mupen64plus-core/projects/unix/Makefile
@@ -96,8 +96,10 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
     PIC ?= 1
        OSD ?= 0
     NEW_DYNAREC := 1
-    CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ffast-math -Wno-maybe-uninitialized -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment 
-    $(warning Architecture "$(HOST_CPU)" not officially supported.')
+    #CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8
+    CFLAGS += -mcpu=native -mtune=native -marm -mfpu=neon
+    CFLAGS += -fsigned-char -ffast-math -Wno-maybe-uninitialized -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment 
+    # $(warning Architecture "$(HOST_CPU)" not officially supported.')
   endif
 endif
 ifeq ("$(CPU)","NONE")

diff --git a/source/mupen64plus-core/src/osd/screenshot.cpp b/source/mupen64plus-core/src/osd/screenshot.cpp
index 9f85fa0..0d4cd9b 100644 (file)
--- a/source/mupen64plus-core/src/osd/screenshot.cpp
+++ b/source/mupen64plus-core/src/osd/screenshot.cpp
@@ -25,7 +25,10 @@
 #include <ctype.h>
 
 #ifdef PANDORA
-#include <SDL_opengles2.h>
+//#include <SDL_opengles2.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
 #else
 #include <SDL_opengl.h>
 #endif

diff --git a/source/mupen64plus-core/src/r4300/new_dynarec/linkage_arm.S b/source/mupen64plus-core/src/r4300/new_dynarec/linkage_arm.S
index 9042176..c4c3dd1 100644 (file)
--- a/source/mupen64plus-core/src/r4300/new_dynarec/linkage_arm.S
+++ b/source/mupen64plus-core/src/r4300/new_dynarec/linkage_arm.S
@@ -17,16 +17,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-       .cpu arm9tdmi
-       .fpu softvfp
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-       .eabi_attribute 23, 3
-       .eabi_attribute 24, 1
-       .eabi_attribute 25, 1
-       .eabi_attribute 26, 2
-       .eabi_attribute 30, 6
-       .eabi_attribute 18, 4
+@      .cpu arm9tdmi
+@      .fpu softvfp
+@      .eabi_attribute 20, 1
+@      .eabi_attribute 21, 1
+@      .eabi_attribute 23, 3
+@      .eabi_attribute 24, 1
+@      .eabi_attribute 25, 1
+@      .eabi_attribute 26, 2
+@      .eabi_attribute 30, 6
+@      .eabi_attribute 18, 4
        .file   "linkage_arm.S"
        .global extra_memory
        .hidden extra_memory

diff --git a/source/mupen64plus-rsp-hle/projects/unix/Makefile b/source/mupen64plus-rsp-hle/projects/unix/Makefile
index d9ac17b..9bce8db 100755 (executable)
--- a/source/mupen64plus-rsp-hle/projects/unix/Makefile
+++ b/source/mupen64plus-rsp-hle/projects/unix/Makefile
@@ -108,7 +108,9 @@ ifneq ("$(filter arm%,$(HOST_CPU))","")
     CPU := ARM
     ARCH_DETECTED := 32BITS
     PIC ?= 1
-    CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ftree-vectorize
+    #CFLAGS += -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a8 -fsigned-char -ftree-vectorize
+    CFLAGS += -fsigned-char
+    CFLAGS += -mcpu=native -mtune=native -marm -mfpu=neon
     $(warning Architecture "$(HOST_CPU)" not officially supported.')
   endif
 endif