(3DS) use Makefile.commmon for non griffin builds

Makefile.ctr

@@ -25,11 +25,11 @@ APP_USE_SVCHAX       = 0
 
 include ctr/Makefile.cores
 
-OBJS :=
-OBJS += gfx/drivers/ctr_shaders/ctr_sprite.o
-OBJS += ctr/ctr_system.o
-OBJS += ctr/ctr_memory.o
-OBJS += ctr/ctr_linear.o
+OBJ :=
+OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
+OBJ += ctr/ctr_system.o
+OBJ += ctr/ctr_memory.o
+OBJ += ctr/ctr_linear.o
 
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
 	APP_USE_SVCHAX = 1
@@ -37,205 +37,56 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 endif
 
 ifeq ($(APP_USE_SVCHAX), 1)
-	OBJS += ctr/ctr_svchax.o
+	OBJ += ctr/ctr_svchax.o
 endif
 
+DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
-	OBJS += griffin/griffin.o
+	OBJ += griffin/griffin.o
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
 else
-	CFLAGS += -DHAVE_COMPRESSION
-	OBJS += libretro-common/file/archive_file.o
-	OBJS += libretro-common/file/archive_file_zlib.o
-	OBJS += libretro-common/file/archive_file_7z.o
-	OBJS += libretro-common/encodings/encoding_utf.o
-	OBJS += verbosity.o
-	OBJS += performance.o
-	OBJS += libretro-common/compat/compat_getopt.o
-	OBJS += libretro-common/compat/compat_strcasestr.o
-	OBJS += libretro-common/compat/compat_strl.o
-	OBJS += libretro-common/compat/compat_fnmatch.o
-	OBJS += libretro-common/memmap/memalign.o
-	OBJS += libretro-common/file/config_file.o
-	OBJS += config_file_userdata.o
-	OBJS += core_options.o
-	OBJS += cheats.o
-	OBJS += libretro-common/hash/rhash.o
-	OBJS += gfx/video_context_driver.o
-	OBJS += gfx/drivers_context/gfx_null_ctx.o
-	OBJS += libretro-common/formats/image_texture.o
-	OBJS += libretro-common/formats/tga/rtga.o
-	OBJS += libretro-common/formats/png/rpng.o
-	OBJS += libretro-common/formats/png/rpng_encode.o
-	OBJS += libretro-common/formats/bmp/rbmp_encode.o
-	OBJS += libretro-common/gfx/math/matrix_4x4.o
-	OBJS += libretro-common/gfx/math/matrix_3x3.o
-	OBJS += gfx/drivers/ctr_gfx.o
-	OBJS += gfx/drivers/nullgfx.o
-	OBJS += gfx/font_driver.o
-	OBJS += gfx/drivers_font_renderer/bitmapfont.o
-	OBJS += input/input_autodetect.o
-	OBJS += input/input_joypad_driver.o
-	OBJS += input/input_hid_driver.o
-	OBJS += input/input_config.o
-	OBJS += input/input_keymaps.o
-	OBJS += input/input_remapping.o
-	OBJS += input/input_keyboard.o
-	OBJS += input/drivers/ctr_input.o
-	OBJS += input/drivers_joypad/ctr_joypad.o
-	OBJS += input/autoconf/builtin_ctr.o
-	OBJS += input/drivers/nullinput.o
-	OBJS += input/drivers_joypad/null_joypad.o
-	OBJS += input/drivers_joypad/hid_joypad.o
-	OBJS += input/drivers_hid/null_hid.o
-	OBJS += gfx/video_state_tracker.o
-	OBJS += libretro-common/queues/fifo_queue.o
-	OBJS += audio/audio_resampler_driver.o
-	OBJS += audio/drivers_resampler/sinc_resampler.o
-	OBJS += audio/drivers_resampler/nearest_resampler.o
-	OBJS += audio/drivers_resampler/null_resampler.o
-	OBJS += audio/drivers_resampler/cc_resampler.o
-	OBJS += camera/drivers/nullcamera.o
-	OBJS += location/drivers/nulllocation.o
-	OBJS += audio/drivers/ctr_csnd_audio.o
-	OBJS += audio/drivers/ctr_dsp_audio.o
-	OBJS += audio/drivers/nullaudio.o
-	OBJS += gfx/video_driver.o
-	OBJS += gfx/video_coord_array.o
-	OBJS += input/input_driver.o
-	OBJS += audio/audio_driver.o
-	OBJS += camera/camera_driver.o
-	OBJS += location/location_driver.o
-	OBJS += driver.o
-	OBJS += libretro-common/gfx/scaler/scaler_filter.o
-	OBJS += libretro-common/gfx/scaler/pixconv.o
-	OBJS += libretro-common/gfx/scaler/scaler.o
-	OBJS += libretro-common/gfx/scaler/scaler_int.o
-	OBJS += gfx/video_filters/2xsai.o
-	OBJS += gfx/video_filters/super2xsai.o
-	OBJS += gfx/video_filters/supereagle.o
-	OBJS += gfx/video_filters/2xbr.o
-	OBJS += gfx/video_filters/darken.o
-	OBJS += gfx/video_filters/epx.o
-	OBJS += gfx/video_filters/scale2x.o
-	OBJS += gfx/video_filters/blargg_ntsc_snes.o
-	OBJS += gfx/video_filters/lq2x.o
-	OBJS += gfx/video_filters/phosphor2x.o
-	OBJS += audio/audio_filters/echo.o
-	OBJS += audio/audio_filters/eq.o
-	OBJS += audio/audio_filters/chorus.o
-	OBJS += audio/audio_filters/iir.o
-	OBJS += audio/audio_filters/panning.o
-	OBJS += audio/audio_filters/phaser.o
-	OBJS += audio/audio_filters/reverb.o
-	OBJS += audio/audio_filters/wahwah.o
-	OBJS += libretro-common/dynamic/dylib.o
-	OBJS += dynamic.o
-	OBJS += gfx/video_filter.o
-	OBJS += audio/audio_dsp_filter.o
-	OBJS += cores/dynamic_dummy.o
-	OBJS += content.o
-	OBJS += libretro-common/file/file_path.o
-	OBJS += file_path_special.o
-	OBJS += libretro-common/lists/dir_list.o
-	OBJS += libretro-common/file/retro_dirent.o
-	OBJS += libretro-common/streams/file_stream.o
-	OBJS += libretro-common/file/retro_stat.o
-	OBJS += list_special.o
-	OBJS += libretro-common/lists/string_list.o
-	OBJS += libretro-common/string/stdstring.o
-	OBJS += libretro-common/file/nbio/nbio_stdio.o
-	OBJS += libretro-common/lists/file_list.o
-	OBJS += libretro-common/queues/message_queue.o
-	OBJS += patch.o
-	OBJS += configuration.o
-	OBJS += rewind.o
-	OBJS += frontend/frontend_driver.o
-	OBJS += frontend/drivers/platform_ctr.o
-	OBJS += frontend/drivers/platform_null.o
-	OBJS += core_info.o
-	OBJS += ui/ui_companion_driver.o
-	OBJS += ui/drivers/ui_null.o
-	OBJS += frontend/frontend.o
-	OBJS += libretro_version_1.o
-	OBJS += retroarch.o
-	OBJS += runloop.o
-	OBJS += libretro-common/queues/task_queue.o
-	OBJS += tasks/tasks_internal.o
-	OBJS += msg_hash.o
-	OBJS += intl/msg_hash_de.o
-	OBJS += intl/msg_hash_es.o
-	OBJS += intl/msg_hash_eo.o
-	OBJS += intl/msg_hash_fr.o
-	OBJS += intl/msg_hash_it.o
-	OBJS += intl/msg_hash_nl.o
-	OBJS += intl/msg_hash_pt.o
-	OBJS += intl/msg_hash_pl.o
-	OBJS += intl/msg_hash_us.o
-	OBJS += movie.o
-	OBJS += record/record_driver.o
-	OBJS += record/drivers/record_null.o
-	OBJS += tasks/task_content.o
-	OBJS += tasks/task_file_transfer.o
-	OBJS += tasks/task_decompress.o
-	OBJS += screenshot.o
-	OBJS += playlist.o
-	OBJS += menu/menu_driver.o
-	OBJS += menu/menu_hash.o
-	OBJS += menu/menu_input.o
-	OBJS += menu/menu_entry.o
-	OBJS += menu/menu_entries.o
-	OBJS += menu/menu_setting.o
-	OBJS += menu/menu_cbs.o
-	OBJS += menu/menu_content.o
-	OBJS += menu/cbs/menu_cbs_ok.o
-	OBJS += menu/cbs/menu_cbs_cancel.o
-	OBJS += menu/cbs/menu_cbs_select.o
-	OBJS += menu/cbs/menu_cbs_start.o
-	OBJS += menu/cbs/menu_cbs_info.o
-	OBJS += menu/cbs/menu_cbs_refresh.o
-	OBJS += menu/cbs/menu_cbs_left.o
-	OBJS += menu/cbs/menu_cbs_right.o
-	OBJS += menu/cbs/menu_cbs_title.o
-	OBJS += menu/cbs/menu_cbs_deferred_push.o
-	OBJS += menu/cbs/menu_cbs_scan.o
-	OBJS += menu/cbs/menu_cbs_get_value.o
-	OBJS += menu/cbs/menu_cbs_up.o
-	OBJS += menu/cbs/menu_cbs_down.o
-	OBJS += menu/cbs/menu_cbs_contentlist_switch.o
-	OBJS += menu/menu_shader.o
-	OBJS += menu/menu_navigation.o
-	OBJS += menu/menu_display.o
-	OBJS += menu/menu_displaylist.o
-	OBJS += menu/menu_animation.o
-	OBJS += menu/intl/menu_hash_de.o
-	OBJS += menu/intl/menu_hash_es.o
-	OBJS += menu/intl/menu_hash_eo.o
-	OBJS += menu/intl/menu_hash_fr.o
-	OBJS += menu/intl/menu_hash_it.o
-	OBJS += menu/intl/menu_hash_nl.o
-	OBJS += menu/intl/menu_hash_pl.o
-	OBJS += menu/intl/menu_hash_pt.o
-	OBJS += menu/intl/menu_hash_us.o
-	OBJS += menu/drivers/null.o
-	OBJS += menu/drivers/menu_generic.o
-	OBJS += menu/drivers_display/menu_display_null.o
-	OBJS += menu/drivers/rgui.o
-	OBJS += command_event.o
-	OBJS += deps/zlib/adler32.o
-	OBJS += deps/zlib/compress.o
-	OBJS += deps/zlib/crc32.o
-	OBJS += deps/zlib/deflate.o
-	OBJS += deps/zlib/gzclose.o
-	OBJS += deps/zlib/gzlib.o
-	OBJS += deps/zlib/gzread.o
-	OBJS += deps/zlib/gzwrite.o
-	OBJS += deps/zlib/inffast.o
-	OBJS += deps/zlib/inflate.o
-	OBJS += deps/zlib/inftrees.o
-	OBJS += deps/zlib/trees.o
-	OBJS += deps/zlib/uncompr.o
-	OBJS += deps/zlib/zutil.o
-	OBJS += audio/audio_utils.o
+	HAVE_MENU_COMMON = 1
+	HAVE_RTGA = 1
+	HAVE_RPNG = 1
+	HAVE_RJPEG = 1
+	HAVE_RBMP = 1
+	HAVE_RGUI = 1
+	HAVE_ZLIB = 1
+	HAVE_7ZIP = 1
+	HAVE_BUILTINZLIB = 1
+	HAVE_BUILTIN_AUTOCONFIG = 1
+
+	include Makefile.common
+	BLACKLIST :=
+	BLACKLIST += input/input_overlay.o
+	BLACKLIST += tasks/task_overlay.o
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	OBJ += gfx/drivers/ctr_gfx.o
+	OBJ += input/drivers/ctr_input.o
+	OBJ += input/drivers_joypad/ctr_joypad.o
+	OBJ += audio/drivers/ctr_csnd_audio.o
+	OBJ += audio/drivers/ctr_dsp_audio.o
+	OBJ += frontend/drivers/platform_ctr.o
+	OBJ += gfx/video_filters/2xsai.o
+	OBJ += gfx/video_filters/super2xsai.o
+	OBJ += gfx/video_filters/supereagle.o
+	OBJ += gfx/video_filters/2xbr.o
+	OBJ += gfx/video_filters/darken.o
+	OBJ += gfx/video_filters/epx.o
+	OBJ += gfx/video_filters/scale2x.o
+	OBJ += gfx/video_filters/blargg_ntsc_snes.o
+	OBJ += gfx/video_filters/lq2x.o
+	OBJ += gfx/video_filters/phosphor2x.o
+	OBJ += audio/audio_filters/echo.o
+	OBJ += audio/audio_filters/eq.o
+	OBJ += audio/audio_filters/chorus.o
+	OBJ += audio/audio_filters/iir.o
+	OBJ += audio/audio_filters/panning.o
+	OBJ += audio/audio_filters/phaser.o
+	OBJ += audio/audio_filters/reverb.o
+	OBJ += audio/audio_filters/wahwah.o
 endif
 
 
@@ -292,8 +143,7 @@ endif
 CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
-CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
-CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
@@ -324,7 +174,7 @@ all: $(TARGET)
 
 $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJS) libretro_ctr.a
+$(TARGET).elf: $(OBJ) libretro_ctr.a
 
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
 
@@ -387,7 +237,7 @@ endif
 	-3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
-	$(LD) $(LDFLAGS) $(OBJS) $(LIBDIRS) $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)
 
 $(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
@@ -404,7 +254,7 @@ $(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(OBJ)
 	rm -f $(TARGET).3dsx
 	rm -f $(TARGET).elf
 	rm -f $(TARGET).3ds

audio/drivers/ctr_csnd_audio.c

@@ -15,6 +15,7 @@
 
 #include <3ds.h>
 #include <string.h>
+#include <malloc.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"

audio/drivers/ctr_dsp_audio.c

@@ -15,6 +15,7 @@
 
 #include <3ds.h>
 #include <string.h>
+#include <malloc.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"

frontend/drivers/platform_ctr.c

@@ -36,6 +36,7 @@
 #include "../../verbosity.h"
 #include "../../defaults.h"
 #include "retroarch.h"
+#include "file_path_special.h"
 #include "audio/audio_driver.h"
 
 #include "ctr/ctr_debug.h"

gfx/video_driver.c

@@ -26,6 +26,7 @@
 #include <retro_assert.h>
 #include <gfx/scaler/pixconv.h>
 #include <gfx/scaler/scaler.h>
+#include <formats/image.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"

libretro-common/features/features_cpu.c

@@ -73,6 +73,11 @@
 #include <ogc/lwp_watchdog.h>
 #endif
 
+#if defined(_3DS)
+#include <3ds/svc.h>
+#include <3ds/os.h>
+#endif
+
 /* iOS/OSX specific. Lacks clock_gettime(), so implement it. */
 #ifdef __MACH__
 #include <sys/time.h>