Merge branch 'master' of github.com:libretro/melonDS

This commit is contained in:
radius 2017-03-19 15:17:39 -05:00
commit d1e58384bc
2 changed files with 2 additions and 1 deletions

View File

@ -29,6 +29,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
system_platform = win
endif
CORE_DIR += ./src
TARGET_NAME := melonds
LIBM = -lm

View File

@ -10,7 +10,7 @@ SOURCES_CXX := $(CORE_DIR)/NDS.cpp \
$(CORE_DIR)/GPU.cpp \
$(CORE_DIR)/GPU2D.cpp \
$(CORE_DIR)/GPU3D.cpp \
$(CORE_DIR)/GPU3D_Soft.cpp \
$(CORE_DIR)/GPU3D_Soft.cpp \
$(CORE_DIR)/NDSCart.cpp \
$(CORE_DIR)/RTC.cpp \
$(CORE_DIR)/SPI.cpp \