Skip to content
Permalink
Browse files
Merge branch 'sync-upstream'
  • Loading branch information
littleguy77 committed Feb 12, 2015
2 parents 288c29d + d5688d3 commit 02025b3f400c33f3cd54c9208ac41dac817e277a
Show file tree
Hide file tree
Showing 92 changed files with 7,162 additions and 4,283 deletions.
@@ -68,50 +68,75 @@ LOCAL_C_INCLUDES := \
$(SDL_INCLUDES) \

LOCAL_SRC_FILES := \
$(SRCDIR)/ai/ai_controller.c \
$(SRCDIR)/api/callbacks.c \
$(SRCDIR)/api/common.c \
$(SRCDIR)/api/config.c \
$(SRCDIR)/api/debugger.c \
$(SRCDIR)/api/frontend.c \
$(SRCDIR)/api/vidext.c \
$(SRCDIR)/main/cheat.c \
$(SRCDIR)/main/eep_file.c \
$(SRCDIR)/main/eventloop.c \
$(SRCDIR)/main/fla_file.c \
$(SRCDIR)/main/main.c \
$(SRCDIR)/main/md5.c \
$(SRCDIR)/main/mpk_file.c \
$(SRCDIR)/main/profile.c \
$(SRCDIR)/main/rom.c \
$(SRCDIR)/main/savestates.c \
$(SRCDIR)/main/sdl_key_converter.c \
$(SRCDIR)/main/sra_file.c \
$(SRCDIR)/main/util.c \
$(SRCDIR)/main/zip/ioapi.c \
$(SRCDIR)/main/zip/unzip.c \
$(SRCDIR)/main/zip/zip.c \
$(SRCDIR)/memory/dma.c \
$(SRCDIR)/memory/flashram.c \
$(SRCDIR)/memory/memory.c \
$(SRCDIR)/memory/n64_cic_nus_6105.c \
$(SRCDIR)/memory/pif.c \
$(SRCDIR)/osal/dynamiclib_unix.c \
$(SRCDIR)/osal/files_unix.c \
$(SRCDIR)/osd/screenshot.cpp \
$(SRCDIR)/pi/cart_rom.c \
$(SRCDIR)/pi/flashram.c \
$(SRCDIR)/pi/pi_controller.c \
$(SRCDIR)/pi/sram.c \
$(SRCDIR)/plugin/dummy_audio.c \
$(SRCDIR)/plugin/dummy_input.c \
$(SRCDIR)/plugin/dummy_rsp.c \
$(SRCDIR)/plugin/dummy_video.c \
$(SRCDIR)/plugin/emulate_game_controller_via_input_plugin.c \
$(SRCDIR)/plugin/get_time_using_C_localtime.c \
$(SRCDIR)/plugin/plugin.c \
$(SRCDIR)/plugin/rumble_via_input_plugin.c \
$(SRCDIR)/r4300/cached_interp.c \
$(SRCDIR)/r4300/cp0.c \
$(SRCDIR)/r4300/cp1.c \
$(SRCDIR)/r4300/empty_dynarec.c \
$(SRCDIR)/r4300/exception.c \
$(SRCDIR)/r4300/instr_counters.c \
$(SRCDIR)/r4300/interupt.c \
$(SRCDIR)/r4300/mi_controller.c \
$(SRCDIR)/r4300/pure_interp.c \
$(SRCDIR)/r4300/r4300.c \
$(SRCDIR)/r4300/r4300_core.c \
$(SRCDIR)/r4300/recomp.c \
$(SRCDIR)/r4300/reset.c \
$(SRCDIR)/r4300/tlb.c \
$(SRCDIR)/r4300/new_dynarec/new_dynarec.c \
$(SRCDIR)/rdp/fb.c \
$(SRCDIR)/rdp/rdp_core.c \
$(SRCDIR)/ri/rdram.c \
$(SRCDIR)/ri/ri_controller.c \
$(SRCDIR)/rsp/rsp_core.c \
$(SRCDIR)/si/af_rtc.c \
$(SRCDIR)/si/cic.c \
$(SRCDIR)/si/eeprom.c \
$(SRCDIR)/si/game_controller.c \
$(SRCDIR)/si/mempak.c \
$(SRCDIR)/si/n64_cic_nus_6105.c \
$(SRCDIR)/si/pif.c \
$(SRCDIR)/si/rumblepak.c \
$(SRCDIR)/si/si_controller.c \
$(SRCDIR)/vi/vi_controller.c \
#$(SRCDIR)/debugger/dbg_breakpoints.c \
#$(SRCDIR)/debugger/dbg_decoder.c \
#$(SRCDIR)/debugger/dbg_memory.c \
@@ -72,10 +72,9 @@ ifeq ("$(OS)","NONE")
$(error OS type "$(UNAME)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
endif

# detect system architecture
# detect system architecture, only if it matters for build flags
HOST_CPU ?= $(shell uname -m)
NO_ASM ?= 1
CPU := NONE
CPU := OTHER
ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
CPU := X86
ifeq ("$(BITS)", "32")
@@ -91,30 +90,8 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
ARCH_DETECTED := 32BITS
PIC ?= 0
endif
ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","")
CPU := PPC
ARCH_DETECTED := 32BITS
BIG_ENDIAN := 1
PIC ?= 1
$(warning Architecture "$(HOST_CPU)" not officially supported.')
endif
ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
CPU := PPC
ARCH_DETECTED := 64BITS
BIG_ENDIAN := 1
ifeq ("$(CPU)","OTHER")
PIC ?= 1
$(warning Architecture "$(HOST_CPU)" not officially supported.')
endif
ifneq ("$(filter arm%,$(HOST_CPU))","")
ifeq ("$(filter arm%b,$(HOST_CPU))","")
CPU := ARM
ARCH_DETECTED := 32BITS
PIC ?= 1
$(warning Architecture "$(HOST_CPU)" not officially supported.')
endif
endif
ifeq ("$(CPU)","NONE")
$(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
endif

# base CFLAGS, LDLIBS, and LDFLAGS
@@ -131,10 +108,6 @@ else
CFLAGS += -fno-PIC
endif

ifeq ($(BIG_ENDIAN), 1)
CFLAGS += -DM64P_BIG_ENDIAN
endif

# tweak flags for 32-bit build on 64-bit system
ifeq ($(ARCH_DETECTED), 64BITS_32)
ifeq ($(OS), FREEBSD)
@@ -102,10 +102,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\si\af_rtc.c" />
<ClCompile Include="..\..\src\ai\ai_controller.c" />
<ClCompile Include="..\..\src\r4300\x86\assemble.c" />
<ClCompile Include="..\..\src\r4300\cached_interp.c" />
<ClCompile Include="..\..\src\api\callbacks.c" />
<ClCompile Include="..\..\src\pi\cart_rom.c" />
<ClCompile Include="..\..\src\main\cheat.c" />
<ClCompile Include="..\..\src\si\cic.c" />
<ClCompile Include="..\..\src\api\common.c" />
<ClCompile Include="..\..\src\api\config.c" />
<ClCompile Include="..\..\src\r4300\cp0.c" />
@@ -120,24 +124,30 @@
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
<ClCompile Include="..\..\src\api\debugger.c" />
<ClCompile Include="..\..\src\memory\dma.c" />
<ClCompile Include="..\..\src\plugin\dummy_audio.c" />
<ClCompile Include="..\..\src\plugin\dummy_input.c" />
<ClCompile Include="..\..\src\plugin\dummy_rsp.c" />
<ClCompile Include="..\..\src\plugin\dummy_video.c" />
<ClCompile Include="..\..\src\osal\dynamiclib_win32.c" />
<ClCompile Include="..\..\src\main\eep_file.c" />
<ClCompile Include="..\..\src\si\eeprom.c" />
<ClCompile Include="..\..\src\plugin\emulate_game_controller_via_input_plugin.c" />
<ClCompile Include="..\..\src\main\eventloop.c" />
<ClCompile Include="..\..\src\r4300\exception.c" />
<ClCompile Include="..\..\src\rdp\fb.c" />
<ClCompile Include="..\..\src\osal\files_win32.c" />
<ClCompile Include="..\..\src\memory\flashram.c" />
<ClCompile Include="..\..\src\main\fla_file.c" />
<ClCompile Include="..\..\src\pi\flashram.c" />
<ClCompile Include="..\..\src\api\frontend.c" />
<ClCompile Include="..\..\src\si\game_controller.c" />
<ClCompile Include="..\..\src\r4300\x86\gbc.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop0.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop1.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop1_d.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop1_l.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop1_s.c" />
<ClCompile Include="..\..\src\r4300\x86\gcop1_w.c" />
<ClCompile Include="..\..\src\plugin\get_time_using_C_localtime.c" />
<ClCompile Include="..\..\src\r4300\x86\gr4300.c" />
<ClCompile Include="..\..\src\r4300\x86\gregimm.c" />
<ClCompile Include="..\..\src\r4300\x86\gspecial.c" />
@@ -149,34 +159,53 @@
<ClCompile Include="..\..\src\main\main.c" />
<ClCompile Include="..\..\src\main\md5.c" />
<ClCompile Include="..\..\src\memory\memory.c" />
<ClCompile Include="..\..\src\memory\n64_cic_nus_6105.c" />
<ClCompile Include="..\..\src\si\mempak.c" />
<ClCompile Include="..\..\src\r4300\mi_controller.c" />
<ClCompile Include="..\..\src\main\mpk_file.c" />
<ClCompile Include="..\..\src\si\n64_cic_nus_6105.c" />
<ClCompile Include="..\..\src\osd\OGLFT.cpp" />
<ClCompile Include="..\..\src\osd\osd.cpp" />
<ClCompile Include="..\..\src\memory\pif.c" />
<ClCompile Include="..\..\src\pi\pi_controller.c" />
<ClCompile Include="..\..\src\si\pif.c" />
<ClCompile Include="..\..\src\plugin\plugin.c" />
<ClCompile Include="..\..\src\main\profile.c" />
<ClCompile Include="..\..\src\r4300\pure_interp.c" />
<ClCompile Include="..\..\src\r4300\r4300.c" />
<ClCompile Include="..\..\src\r4300\r4300_core.c" />
<ClCompile Include="..\..\src\rdp\rdp_core.c" />
<ClCompile Include="..\..\src\ri\rdram.c" />
<ClCompile Include="..\..\src\r4300\recomp.c" />
<ClCompile Include="..\..\src\r4300\x86\regcache.c" />
<ClCompile Include="..\..\src\r4300\reset.c" />
<ClCompile Include="..\..\src\ri\ri_controller.c" />
<ClCompile Include="..\..\src\r4300\x86\rjump.c" />
<ClCompile Include="..\..\src\main\rom.c" />
<ClCompile Include="..\..\src\rsp\rsp_core.c" />
<ClCompile Include="..\..\src\plugin\rumble_via_input_plugin.c" />
<ClCompile Include="..\..\src\si\rumblepak.c" />
<ClCompile Include="..\..\src\main\savestates.c" />
<ClCompile Include="..\..\src\main\sdl_key_converter.c" />
<ClCompile Include="..\..\src\osd\screenshot.cpp" />
<ClCompile Include="..\..\src\si\si_controller.c" />
<ClCompile Include="..\..\src\main\sra_file.c" />
<ClCompile Include="..\..\src\pi\sram.c" />
<ClCompile Include="..\..\src\r4300\tlb.c" />
<ClCompile Include="..\..\src\main\zip\unzip.c" />
<ClCompile Include="..\..\src\main\util.c" />
<ClCompile Include="..\..\src\vi\vi_controller.c" />
<ClCompile Include="..\..\src\api\vidext.c" />
<ClCompile Include="..\..\src\main\workqueue.c" />
<ClCompile Include="..\..\src\main\zip\zip.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\si\af_rtc.h" />
<ClInclude Include="..\..\src\ai\ai_controller.h" />
<ClInclude Include="..\..\src\r4300\x86\assemble.h" />
<ClInclude Include="..\..\src\r4300\cached_interp.h" />
<ClInclude Include="..\..\src\api\callbacks.h" />
<ClInclude Include="..\..\src\pi\cart_rom.h" />
<ClInclude Include="..\..\src\main\cheat.h" />
<ClInclude Include="..\..\src\si\cic.h" />
<ClInclude Include="..\..\src\api\config.h" />
<ClInclude Include="..\..\src\r4300\cp0.h" />
<ClInclude Include="..\..\src\r4300\cp1.h" />
@@ -188,16 +217,22 @@
<ClInclude Include="..\..\src\debugger\dbg_types.h" />
<ClInclude Include="..\..\src\debugger\debugger.h" />
<ClInclude Include="..\..\src\api\debugger.h" />
<ClInclude Include="..\..\src\memory\dma.h" />
<ClInclude Include="..\..\src\plugin\dummy_audio.h" />
<ClInclude Include="..\..\src\plugin\dummy_input.h" />
<ClInclude Include="..\..\src\plugin\dummy_rsp.h" />
<ClInclude Include="..\..\src\plugin\dummy_video.h" />
<ClInclude Include="..\..\src\osal\dynamiclib.h" />
<ClInclude Include="..\..\src\main\eep_file.h" />
<ClInclude Include="..\..\src\si\eeprom.h" />
<ClInclude Include="..\..\src\plugin\emulate_game_controller_via_input_plugin.h" />
<ClInclude Include="..\..\src\main\eventloop.h" />
<ClInclude Include="..\..\src\r4300\exception.h" />
<ClInclude Include="..\..\src\rdp\fb.h" />
<ClInclude Include="..\..\src\osal\files.h" />
<ClInclude Include="..\..\src\memory\flashram.h" />
<ClInclude Include="..\..\src\main\fla_file.h" />
<ClInclude Include="..\..\src\pi\flashram.h" />
<ClInclude Include="..\..\src\si\game_controller.h" />
<ClInclude Include="..\..\src\plugin\get_time_using_C_localtime.h" />
<ClInclude Include="..\..\src\r4300\instr_counters.h" />
<ClInclude Include="..\..\src\r4300\x86\interpret.h" />
<ClInclude Include="..\..\src\r4300\interupt.h" />
@@ -214,27 +249,42 @@
<ClInclude Include="..\..\src\main\main.h" />
<ClInclude Include="..\..\src\main\md5.h" />
<ClInclude Include="..\..\src\memory\memory.h" />
<ClInclude Include="..\..\src\memory\n64_cic_nus_6105.h" />
<ClInclude Include="..\..\src\si\mempak.h" />
<ClInclude Include="..\..\src\r4300\mi_controller.h" />
<ClInclude Include="..\..\src\main\mpk_file.h" />
<ClInclude Include="..\..\src\si\n64_cic_nus_6105.h" />
<ClInclude Include="..\..\src\osd\OGLFT.h" />
<ClInclude Include="..\..\src\r4300\ops.h" />
<ClInclude Include="..\..\src\osd\osd.h" />
<ClInclude Include="..\..\src\memory\pif.h" />
<ClInclude Include="..\..\src\pi\pi_controller.h" />
<ClInclude Include="..\..\src\si\pif.h" />
<ClInclude Include="..\..\src\plugin\plugin.h" />
<ClInclude Include="..\..\src\osal\preproc.h" />
<ClInclude Include="..\..\src\main\profile.h" />
<ClInclude Include="..\..\src\r4300\pure_interp.h" />
<ClInclude Include="..\..\src\r4300\r4300.h" />
<ClInclude Include="..\..\src\r4300\r4300_core.h" />
<ClInclude Include="..\..\src\rdp\rdp_core.h" />
<ClInclude Include="..\..\src\ri\rdram.h" />
<ClInclude Include="..\..\src\r4300\recomp.h" />
<ClInclude Include="..\..\src\r4300\recomph.h" />
<ClInclude Include="..\..\src\r4300\x86\regcache.h" />
<ClInclude Include="..\..\src\r4300\reset.h" />
<ClInclude Include="..\..\src\ri\ri_controller.h" />
<ClInclude Include="..\..\src\main\rom.h" />
<ClInclude Include="..\..\src\rsp\rsp_core.h" />
<ClInclude Include="..\..\src\plugin\rumble_via_input_plugin.h" />
<ClInclude Include="..\..\src\si\rumblepak.h" />
<ClInclude Include="..\..\src\main\savestates.h" />
<ClInclude Include="..\..\src\main\sdl_key_converter.h" />
<ClInclude Include="..\..\src\osd\screenshot.h" />
<ClInclude Include="..\..\src\si\si_controller.h" />
<ClInclude Include="..\..\src\main\sra_file.h" />
<ClInclude Include="..\..\src\pi\sram.h" />
<ClInclude Include="..\..\src\r4300\tlb.h" />
<ClInclude Include="..\..\src\main\zip\unzip.h" />
<ClInclude Include="..\..\src\main\util.h" />
<ClInclude Include="..\..\src\vi\vi_controller.h" />
<ClInclude Include="..\..\src\main\version.h" />
<ClInclude Include="..\..\src\api\vidext.h" />
<ClInclude Include="..\..\src\main\workqueue.h" />

0 comments on commit 02025b3

Please sign in to comment.