diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h old mode 100755 new mode 100644 diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h old mode 100755 new mode 100644 diff --git a/desmume/src/OGLRender_3_2.cpp b/desmume/src/OGLRender_3_2.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/driver.h b/desmume/src/driver.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/AppIcon_DeSmuME.icns b/desmume/src/frontend/cocoa/AppIcon_DeSmuME.icns old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/frontend/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SIL Open Font License.txt b/desmume/src/frontend/cocoa/source-sans-pro/SIL Open Font License.txt old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Black.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Black.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-BlackIt.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-BlackIt.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Bold.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Bold.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-BoldIt.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-BoldIt.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-ExtraLight.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-ExtraLight.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-ExtraLightIt.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-ExtraLightIt.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-It.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-It.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Light.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Light.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-LightIt.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-LightIt.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Regular.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Regular.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Semibold.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-Semibold.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-SemiboldIt.otf b/desmume/src/frontend/cocoa/source-sans-pro/SourceSansPro-SemiboldIt.otf old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/libretro/Makefile.libretro b/desmume/src/frontend/libretro/Makefile.libretro index 5a6f9c76..3ba83c87 100644 --- a/desmume/src/frontend/libretro/Makefile.libretro +++ b/desmume/src/frontend/libretro/Makefile.libretro @@ -15,20 +15,39 @@ ifneq ($(SANITIZER),) endif ifeq ($(platform),) - platform = unix - ifeq ($(shell uname -a),) - platform = win - else ifneq ($(findstring MINGW,$(shell uname -a)),) - platform = win - else ifneq ($(findstring Darwin,$(shell uname -a)),) - platform = osx - else ifneq ($(findstring win,$(shell uname -a)),) - platform = win - endif -else ifneq (,$(findstring armv,$(platform))) - ifeq (,$(findstring classic_,$(platform))) - override platform += unix - endif +platform = unix +ifeq ($(shell uname -a),) + platform = win +else ifneq ($(findstring Darwin,$(shell uname -a)),) + platform = osx + arch = intel +ifeq ($(shell uname -p),arm) + arch = arm +endif +ifeq ($(shell uname -p),powerpc) + arch = ppc +endif +else ifneq ($(findstring MINGW,$(shell uname -a)),) + platform = win +endif +endif + +# system platform +system_platform = unix +ifeq ($(shell uname -a),) +EXE_EXT = .exe + system_platform = win +else ifneq ($(findstring Darwin,$(shell uname -a)),) + system_platform = osx + arch = intel +ifeq ($(shell uname -p),arm) + arch = ppc +endif +ifeq ($(shell uname -p),powerpc) + arch = ppc +endif +else ifneq ($(findstring MINGW,$(shell uname -a)),) + system_platform = win endif prefix := /usr @@ -136,17 +155,30 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib -framework OpenGL + +ifeq ($(UNIVERSAL),1) +ifeq ($(ARCHFLAGS),) + ARCHFLAGS = -arch i386 -arch x86_64 +ifeq ($(archs),arm) + ARCHFLAGS = -arch arm64 +endif +ifeq ($(archs),ppc) + ARCHFLAGS = -arch ppc -arch ppc64 +endif +endif +endif + ifeq ($(CROSS_COMPILE),1) ARCHFLAGS = -arch $(ARCH) -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT) else - ifneq ($(shell uname -m),arm64) + ifeq ($(archs),arm) DESMUME_JIT = 1 endif endif ifeq ($(OSX_LT_MAVERICKS),"YES") fpic += -mmacosx-version-min=10.2 else - fpic += -mmacosx-version-min=10.7 -stdlib=libc++ + fpic += -mmacosx-version-min=10.7 -stdlib=libc++ endif CFLAGS += -DAPPLE_ATOMICS CXXFLAGS += -DAPPLE_ATOMICS @@ -155,7 +187,7 @@ endif CXXFLAGS += $(ARCHFLAGS) LDFLAGS += $(ARCHFLAGS) endif - DESMUME_OPENGL = 1 + DESMUME_OPENGL = 1 # iOS else ifneq (,$(findstring ios,$(platform))) diff --git a/desmume/src/frontend/posix/gtk-glade/callbacks.cpp b/desmume/src/frontend/posix/gtk-glade/callbacks.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/callbacks.h b/desmume/src/frontend/posix/gtk-glade/callbacks.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/callbacks_IO.cpp b/desmume/src/frontend/posix/gtk-glade/callbacks_IO.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/callbacks_IO.h b/desmume/src/frontend/posix/gtk-glade/callbacks_IO.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_1_ioregs.cpp b/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_1_ioregs.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_2_memview.cpp b/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_2_memview.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_3_palview.cpp b/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_3_palview.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_4_tileview.cpp b/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_4_tileview.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_dtools.h b/desmume/src/frontend/posix/gtk-glade/dTools/callbacks_dtools.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/dTools/dTools_display.h b/desmume/src/frontend/posix/gtk-glade/dTools/dTools_display.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/desmume.cpp b/desmume/src/frontend/posix/gtk-glade/desmume.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/desmume.h b/desmume/src/frontend/posix/gtk-glade/desmume.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/gdk_gl.cpp b/desmume/src/frontend/posix/gtk-glade/gdk_gl.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/gdk_gl.h b/desmume/src/frontend/posix/gtk-glade/gdk_gl.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/glade-xml.cpp b/desmume/src/frontend/posix/gtk-glade/glade-xml.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/glade/DeSmuME.xpm b/desmume/src/frontend/posix/gtk-glade/glade/DeSmuME.xpm old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/glade/DeSmuMe.glade b/desmume/src/frontend/posix/gtk-glade/glade/DeSmuMe.glade old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/glade/DeSmuMe_Dtools.glade b/desmume/src/frontend/posix/gtk-glade/glade/DeSmuMe_Dtools.glade old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/globals.h b/desmume/src/frontend/posix/gtk-glade/globals.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/keyval_names.cpp b/desmume/src/frontend/posix/gtk-glade/keyval_names.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/keyval_names.h b/desmume/src/frontend/posix/gtk-glade/keyval_names.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk-glade/main.cpp b/desmume/src/frontend/posix/gtk-glade/main.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/posix/gtk/dylibbundler b/desmume/src/frontend/posix/gtk/dylibbundler old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/7z.dll b/desmume/src/frontend/windows/7z.dll old mode 100644 new mode 100755 diff --git a/desmume/src/frontend/windows/7z.exe b/desmume/src/frontend/windows/7z.exe old mode 100644 new mode 100755 diff --git a/desmume/src/frontend/windows/aviout.cpp b/desmume/src/frontend/windows/aviout.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/aviout.h b/desmume/src/frontend/windows/aviout.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/inputdx.cpp b/desmume/src/frontend/windows/inputdx.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/ogl_display.cpp b/desmume/src/frontend/windows/ogl_display.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/ogl_display.h b/desmume/src/frontend/windows/ogl_display.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/resource.h b/desmume/src/frontend/windows/resource.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/resources.rc b/desmume/src/frontend/windows/resources.rc old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/snddx.cpp b/desmume/src/frontend/windows/snddx.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/snddx.h b/desmume/src/frontend/windows/snddx.h old mode 100755 new mode 100644 diff --git a/desmume/src/frontend/windows/touch.exe b/desmume/src/frontend/windows/touch.exe old mode 100644 new mode 100755 diff --git a/desmume/src/frontend/windows/winpcap.h b/desmume/src/frontend/windows/winpcap.h old mode 100755 new mode 100644 diff --git a/desmume/src/libretro-common/audio/dsp_filters/configure b/desmume/src/libretro-common/audio/dsp_filters/configure old mode 100644 new mode 100755 diff --git a/desmume/src/libretro-common/samples/utils/crc32.exe b/desmume/src/libretro-common/samples/utils/crc32.exe old mode 100644 new mode 100755 diff --git a/desmume/src/libretro-common/samples/utils/djb2.exe b/desmume/src/libretro-common/samples/utils/djb2.exe old mode 100644 new mode 100755 diff --git a/desmume/src/libretro-common/samples/utils/md5.exe b/desmume/src/libretro-common/samples/utils/md5.exe old mode 100644 new mode 100755 diff --git a/desmume/src/libretro-common/samples/utils/sha1.exe b/desmume/src/libretro-common/samples/utils/sha1.exe old mode 100644 new mode 100755 diff --git a/desmume/src/metaspu/SoundTouch/build.sh b/desmume/src/metaspu/SoundTouch/build.sh old mode 100644 new mode 100755 diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/movie.h b/desmume/src/movie.h old mode 100755 new mode 100644 diff --git a/desmume/src/rasterize.cpp b/desmume/src/rasterize.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/types.h b/desmume/src/types.h old mode 100755 new mode 100644 diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp old mode 100755 new mode 100644 diff --git a/desmume/src/wifi.h b/desmume/src/wifi.h old mode 100755 new mode 100644 diff --git a/tools/IDA/nds.ldw b/tools/IDA/nds.ldw old mode 100644 new mode 100755