Merge pull request #3 from sergiobenrocha2/master
Avoid proprietary format in copying, HAVE_DYNAREC in armv.
This commit is contained in:
commit
67197d550e
|
@ -1,7 +1,7 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 2, June 1991
|
Version 2, June 1991
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
of this license document, but changing it is not allowed.
|
||||||
|
@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License along
|
||||||
along with this program; if not, write to the Free Software
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
40
Makefile
40
Makefile
|
@ -5,24 +5,26 @@ FORCE_32BIT_ARCH=0
|
||||||
HAVE_MMAP=0
|
HAVE_MMAP=0
|
||||||
HAVE_MMAP_WIN32=0
|
HAVE_MMAP_WIN32=0
|
||||||
|
|
||||||
|
UNAME=$(shell uname -a)
|
||||||
|
|
||||||
ifneq ($(EMSCRIPTEN),)
|
ifneq ($(EMSCRIPTEN),)
|
||||||
platform = emscripten
|
platform = emscripten
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(platform),)
|
ifeq ($(platform),)
|
||||||
platform = unix
|
platform = unix
|
||||||
ifeq ($(shell uname -a),)
|
ifeq ($(UNAME),)
|
||||||
platform = win
|
platform = win
|
||||||
else ifneq ($(findstring MINGW,$(shell uname -a)),)
|
else ifneq ($(findstring MINGW,$(UNAME)),)
|
||||||
platform = win
|
platform = win
|
||||||
else ifneq ($(findstring Darwin,$(shell uname -a)),)
|
else ifneq ($(findstring Darwin,$(UNAME)),)
|
||||||
platform = osx
|
platform = osx
|
||||||
arch = intel
|
arch = intel
|
||||||
ifeq ($(shell uname -p),powerpc)
|
ifeq ($(shell uname -p),powerpc)
|
||||||
arch = ppc
|
arch = ppc
|
||||||
FORCE_32BIT_ARCH = 1
|
FORCE_32BIT_ARCH = 1
|
||||||
endif
|
endif
|
||||||
else ifneq ($(findstring win,$(shell uname -a)),)
|
else ifneq ($(findstring win,$(UNAME)),)
|
||||||
platform = win
|
platform = win
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -46,16 +48,16 @@ endif
|
||||||
|
|
||||||
# system platform
|
# system platform
|
||||||
system_platform = unix
|
system_platform = unix
|
||||||
ifeq ($(shell uname -a),)
|
ifeq ($(UNAME),)
|
||||||
EXE_EXT = .exe
|
EXE_EXT = .exe
|
||||||
system_platform = win
|
system_platform = win
|
||||||
else ifneq ($(findstring Darwin,$(shell uname -a)),)
|
else ifneq ($(findstring Darwin,$(UNAME)),)
|
||||||
system_platform = osx
|
system_platform = osx
|
||||||
arch = intel
|
arch = intel
|
||||||
ifeq ($(shell uname -p),powerpc)
|
ifeq ($(shell uname -p),powerpc)
|
||||||
arch = ppc
|
arch = ppc
|
||||||
endif
|
endif
|
||||||
else ifneq ($(findstring MINGW,$(shell uname -a)),)
|
else ifneq ($(findstring MINGW,$(UNAME)),)
|
||||||
system_platform = win
|
system_platform = win
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -74,10 +76,10 @@ ifeq ($(platform), unix)
|
||||||
endif
|
endif
|
||||||
CFLAGS += $(FORCE_32BIT)
|
CFLAGS += $(FORCE_32BIT)
|
||||||
LDFLAGS := -Wl,--no-undefined
|
LDFLAGS := -Wl,--no-undefined
|
||||||
|
ifeq ($(HAVE_DYNAREC),1)
|
||||||
ifeq ($(HAVE_DYNAREC),1)
|
|
||||||
HAVE_MMAP = 1
|
HAVE_MMAP = 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# OS X
|
# OS X
|
||||||
else ifeq ($(platform), osx)
|
else ifeq ($(platform), osx)
|
||||||
TARGET := $(TARGET_NAME)_libretro.dylib
|
TARGET := $(TARGET_NAME)_libretro.dylib
|
||||||
|
@ -91,10 +93,9 @@ else ifeq ($(platform), osx)
|
||||||
fpic += -mmacosx-version-min=10.5
|
fpic += -mmacosx-version-min=10.5
|
||||||
endif
|
endif
|
||||||
SHARED := -dynamiclib
|
SHARED := -dynamiclib
|
||||||
|
ifeq ($(HAVE_DYNAREC),1)
|
||||||
ifeq ($(HAVE_DYNAREC),1)
|
|
||||||
HAVE_MMAP = 1
|
HAVE_MMAP = 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# iOS
|
# iOS
|
||||||
else ifeq ($(platform), ios)
|
else ifeq ($(platform), ios)
|
||||||
|
@ -186,7 +187,8 @@ else ifeq ($(platform), wii)
|
||||||
# ARM
|
# ARM
|
||||||
else ifneq (,$(findstring armv,$(platform)))
|
else ifneq (,$(findstring armv,$(platform)))
|
||||||
TARGET := $(TARGET_NAME)_libretro.so
|
TARGET := $(TARGET_NAME)_libretro.so
|
||||||
SHARED := -shared -Wl,--no-undefined
|
SHARED := -shared -Wl,--version-script=link.T
|
||||||
|
CPU_ARCH := arm
|
||||||
fpic := -fPIC
|
fpic := -fPIC
|
||||||
CC = gcc
|
CC = gcc
|
||||||
ifneq (,$(findstring cortexa8,$(platform)))
|
ifneq (,$(findstring cortexa8,$(platform)))
|
||||||
|
@ -209,8 +211,9 @@ else ifneq (,$(findstring armv,$(platform)))
|
||||||
CFLAGS += -mfloat-abi=hard
|
CFLAGS += -mfloat-abi=hard
|
||||||
ASFLAGS += -mfloat-abi=hard
|
ASFLAGS += -mfloat-abi=hard
|
||||||
endif
|
endif
|
||||||
CFLAGS += -DARM
|
HAVE_DYNAREC := 1
|
||||||
HAVE_MMAP = 1
|
CFLAGS += -DARM -DARM_ARCH -DARM_MEMORY_DYNAREC
|
||||||
|
LDFLAGS := -Wl,--no-undefined
|
||||||
|
|
||||||
# emscripten
|
# emscripten
|
||||||
else ifeq ($(platform), emscripten)
|
else ifeq ($(platform), emscripten)
|
||||||
|
@ -222,11 +225,10 @@ else
|
||||||
CC = gcc
|
CC = gcc
|
||||||
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T
|
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T
|
||||||
CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
|
CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
|
||||||
|
ifeq ($(HAVE_DYNAREC),1)
|
||||||
ifeq ($(HAVE_DYNAREC),1)
|
|
||||||
HAVE_MMAP = 1
|
HAVE_MMAP = 1
|
||||||
HAVE_MMAP_WIN32 = 1
|
HAVE_MMAP_WIN32 = 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue