mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buildfix

Browse Source
This commit is contained in:
twinaphex 2016-06-07 06:35:48 +02:00
parent 9b60b81f70
commit f15b722786
1 changed files with 92 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
Makefile.common
View File

@ -1,7 +1,3 @@
CFLAGS += -I./libretro-common/include
# Switches
ifeq ($(HAVE_GL_CONTEXT),) ifeq ($(HAVE_GL_CONTEXT),)
HAVE_GL_CONTEXT=0 HAVE_GL_CONTEXT=0
@ -68,111 +64,10 @@ ifeq ($(HAVE_SHADERPIPELINE), 1)
CFLAGS += -DHAVE_SHADERPIPELINE CFLAGS += -DHAVE_SHADERPIPELINE
endif endif
# General libretro-common files CFLAGS += -I./libretro-common/include
OBJ += libretro-common/algorithms/mismatch.o \ # Switches
libretro-common/queues/task_queue.o \
libretro-common/queues/fifo_queue.o \
libretro-common/encodings/encoding_utf.o \
libretro-common/lists/file_list.o \
libretro-common/lists/dir_list.o \
libretro-common/file/retro_dirent.o \
libretro-common/streams/file_stream.o \
libretro-common/streams/interface_stream.o \
libretro-common/streams/memory_stream.o \
libretro-common/file/retro_stat.o \
libretro-common/lists/string_list.o \
libretro-common/string/stdstring.o \
libretro-common/memmap/memalign.o \
libretro-common/file/nbio/nbio_stdio.o \
libretro-common/file/file_path.o \
libretro-common/hash/rhash.o \
libretro-common/dynamic/dylib.o \
libretro-common/queues/message_queue.o \
libretro-common/compat/compat_fnmatch.o \
libretro-common/compat/compat_posix_string.o \
libretro-common/file/config_file.o \
libretro-common/gfx/scaler/scaler.o \
libretro-common/gfx/scaler/pixconv.o \
libretro-common/gfx/scaler/scaler_int.o \
libretro-common/gfx/scaler/scaler_filter.o \
libretro-common/features/features_cpu.o \
libretro-common/formats/image_texture.o \
libretro-common/conversion/s16_to_float.o \
libretro-common/conversion/float_to_s16.o \
libretro-common/gfx/math/matrix_4x4.o \
libretro-common/gfx/math/matrix_3x3.o \
libretro-common/formats/json/jsonsax.o \
libretro-common/formats/image_transfer.o
ifeq ($(HAVE_THREADS), 1)
OBJ += libretro-common/rthreads/rthreads.o \
libretro-common/rthreads/rsemaphore.o
endif
ifeq ($(HAVE_GL_CONTEXT), 1)
OBJ += libretro-common/glsym/rglgen.o
endif
ifneq ($(HAVE_GETOPT_LONG), 1)
OBJ += libretro-common/compat/compat_getopt.o
endif
ifneq ($(HAVE_STRCASESTR), 1)
OBJ += libretro-common/compat/compat_strcasestr.o
endif
ifneq ($(HAVE_STRL), 1)
OBJ += libretro-common/compat/compat_strl.o
endif
ifeq ($(HAVE_NEON),1)
OBJ += libretro-common/conversion/s16_to_float_neon.o \
libretro-common/conversion/float_to_s16_neon.o
endif
ifeq ($(HAVE_RTGA), 1)
OBJ += libretro-common/formats/tga/rtga.o
endif
ifeq ($(HAVE_RPNG), 1)
OBJ += libretro-common/formats/png/rpng.o \
libretro-common/formats/png/rpng_encode.o
endif
ifeq ($(HAVE_RJPEG), 1)
OBJ += libretro-common/formats/jpeg/rjpeg.o
endif
ifeq ($(HAVE_RBMP), 1)
OBJ += libretro-common/formats/bmp/rbmp.o \
libretro-common/formats/bmp/rbmp_encode.o
endif
ifeq ($(HAVE_NETWORKING), 1)
OBJ += libretro-common/net/net_compat.o \
libretro-common/net/net_http.o \
libretro-common/net/net_socket.o
ifneq ($(HAVE_SOCKET_LEGACY),1)
OBJ += libretro-common/net/net_ifinfo.o
endif
ifeq ($(WANT_IFADDRS), 1)
OBJ += libretro-common/compat/compat_ifaddrs.o
endif
ifeq ($(HAVE_CHEEVOS), 1)
ifeq ($(HAVE_THREADS), 1)
OBJ += libretro-common/utils/md5.o
endif
endif
endif
ifeq ($(HAVE_ZLIB), 1)
OBJ += libretro-common/file/archive_file.o \
libretro-common/file/archive_file_zlib.o
endif
# System # System
@ -196,6 +91,7 @@ ifneq ($(findstring Linux,$(OS)),)
frontend/drivers/platform_linux.o frontend/drivers/platform_linux.o
endif endif
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lm LIBS += -lm
DEBUG_FLAG = -g DEBUG_FLAG = -g
@ -213,8 +109,8 @@ ifneq ($(GIT_VERSION),)
OBJ += git_version.o OBJ += git_version.o
endif endif
# General object files # General object files
OBJ += frontend/frontend.o \ OBJ += frontend/frontend.o \
frontend/frontend_driver.o \ frontend/frontend_driver.o \
frontend/drivers/platform_null.o \ frontend/drivers/platform_null.o \
@ -228,14 +124,30 @@ OBJ += frontend/frontend.o \
msg_hash.o \ msg_hash.o \
intl/msg_hash_us.o \ intl/msg_hash_us.o \
runloop.o \ runloop.o \
libretro-common/algorithms/mismatch.o \
libretro-common/queues/task_queue.o \
tasks/tasks_internal.o \ tasks/tasks_internal.o \
tasks/task_content.o \ tasks/task_content.o \
tasks/task_save_ram.o \ tasks/task_save_ram.o \
tasks/task_save_state.o \ tasks/task_save_state.o \
tasks/task_file_transfer.o \ tasks/task_file_transfer.o \
tasks/task_image.o \ tasks/task_image.o \
libretro-common/encodings/encoding_utf.o \
libretro-common/lists/file_list.o \
libretro-common/lists/dir_list.o \
libretro-common/file/retro_dirent.o \
libretro-common/streams/file_stream.o \
libretro-common/streams/interface_stream.o \
libretro-common/streams/memory_stream.o \
libretro-common/file/retro_stat.o \
libretro-common/lists/string_list.o \
libretro-common/string/stdstring.o \
libretro-common/memmap/memalign.o \
list_special.o \ list_special.o \
libretro-common/file/nbio/nbio_stdio.o \
libretro-common/file/file_path.o \
file_path_special.o \ file_path_special.o \
libretro-common/hash/rhash.o \
audio/audio_driver.o \ audio/audio_driver.o \
input/input_driver.o \ input/input_driver.o \
gfx/video_coord_array.o \ gfx/video_coord_array.o \
@ -244,8 +156,10 @@ OBJ += frontend/frontend.o \
location/location_driver.o \ location/location_driver.o \
driver.o \ driver.o \
configuration.o \ configuration.o \
libretro-common/dynamic/dylib.o \
dynamic.o \ dynamic.o \
cores/dynamic_dummy.o \ cores/dynamic_dummy.o \
libretro-common/queues/message_queue.o \
managers/state_manager.o \ managers/state_manager.o \
gfx/drivers_font_renderer/bitmapfont.o \ gfx/drivers_font_renderer/bitmapfont.o \
input/input_autodetect.o \ input/input_autodetect.o \
@ -256,14 +170,22 @@ OBJ += frontend/frontend.o \
tasks/task_overlay.o \ tasks/task_overlay.o \
input/input_overlay.o \ input/input_overlay.o \
patch.o \ patch.o \
libretro-common/queues/fifo_queue.o \
managers/core_option_manager.o \ managers/core_option_manager.o \
libretro-common/compat/compat_fnmatch.o \
libretro-common/compat/compat_posix_string.o \
managers/cheat_manager.o \ managers/cheat_manager.o \
core_info.o \ core_info.o \
libretro-common/file/config_file.o \
config_file_userdata.o \ config_file_userdata.o \
tasks/task_screenshot.o \ tasks/task_screenshot.o \
libretro-common/gfx/scaler/scaler.o \
gfx/drivers_shader/shader_null.o \ gfx/drivers_shader/shader_null.o \
gfx/video_shader_driver.o \ gfx/video_shader_driver.o \
gfx/video_shader_parse.o \ gfx/video_shader_parse.o \
libretro-common/gfx/scaler/pixconv.o \
libretro-common/gfx/scaler/scaler_int.o \
libretro-common/gfx/scaler/scaler_filter.o \
gfx/font_driver.o \ gfx/font_driver.o \
gfx/video_filter.o \ gfx/video_filter.o \
audio/audio_resampler_driver.o \ audio/audio_resampler_driver.o \
@ -283,6 +205,7 @@ OBJ += frontend/frontend.o \
movie.o \ movie.o \
record/record_driver.o \ record/record_driver.o \
record/drivers/record_null.o \ record/drivers/record_null.o \
libretro-common/features/features_cpu.o \
performance_counters.o \ performance_counters.o \
verbosity.o verbosity.o
@ -299,6 +222,19 @@ OBJ += intl/msg_hash_de.o \
endif endif
ifneq ($(HAVE_GETOPT_LONG), 1)
OBJ += libretro-common/compat/compat_getopt.o
endif
ifneq ($(HAVE_STRCASESTR), 1)
OBJ += libretro-common/compat/compat_strcasestr.o
endif
ifneq ($(HAVE_STRL), 1)
OBJ += libretro-common/compat/compat_strl.o
endif
OBJ += libretro-common/formats/image_texture.o
ifeq ($(HAVE_IMAGEVIEWER), 1) ifeq ($(HAVE_IMAGEVIEWER), 1)
DEFINES += -DHAVE_IMAGEVIEWER DEFINES += -DHAVE_IMAGEVIEWER
@ -446,6 +382,12 @@ ifeq ($(HAVE_NEON),1)
DEFINES += -DSINC_LOWER_QUALITY DEFINES += -DSINC_LOWER_QUALITY
endif endif
OBJ += libretro-common/conversion/s16_to_float.o \
libretro-common/conversion/float_to_s16.o
ifeq ($(HAVE_NEON),1)
OBJ += libretro-common/conversion/s16_to_float_neon.o \
libretro-common/conversion/float_to_s16_neon.o
endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
HAVE_VULKAN=1 HAVE_VULKAN=1
@ -526,6 +468,17 @@ ifeq ($(HAVE_MENU_COMMON), 1)
else else
PSEUDO_NS := PSEUDO_NS :=
endif endif
ifeq ($(HAVE_LANGEXTRA), 1)
OBJ += menu/intl/menu_hash_de.o \
menu/intl/menu_hash_es.o \
menu/intl/menu_hash_eo.o \
menu/intl/menu_hash_fr.o \
menu/intl/menu_hash_it.o \
menu/intl/menu_hash_nl.o \
menu/intl/menu_hash_pl.o \
menu/intl/menu_hash_pt.o
endif
OBJ += menu/menu_hash.o \ OBJ += menu/menu_hash.o \
menu/menu_driver.o \ menu/menu_driver.o \
menu/menu_content.o \ menu/menu_content.o \
@ -558,17 +511,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/drivers_display/menu_display_null.o \ menu/drivers_display/menu_display_null.o \
menu/drivers/menu_generic.o \ menu/drivers/menu_generic.o \
menu/drivers/null.o menu/drivers/null.o
ifeq ($(HAVE_LANGEXTRA), 1)
OBJ += menu/intl/menu_hash_de.o \
menu/intl/menu_hash_es.o \
menu/intl/menu_hash_eo.o \
menu/intl/menu_hash_fr.o \
menu/intl/menu_hash_it.o \
menu/intl/menu_hash_nl.o \
menu/intl/menu_hash_pl.o \
menu/intl/menu_hash_pt.o
endif
endif endif
ifeq ($(UTF8), 1) ifeq ($(UTF8), 1)
@ -588,7 +530,9 @@ ifeq ($(HAVE_FREETYPE), 1)
endif endif
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
OBJ += gfx/video_thread_wrapper.o \ OBJ += libretro-common/rthreads/rthreads.o \
libretro-common/rthreads/rsemaphore.o \
gfx/video_thread_wrapper.o \
audio/audio_thread_wrapper.o audio/audio_thread_wrapper.o
DEFINES += -DHAVE_THREADS DEFINES += -DHAVE_THREADS
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
@ -712,7 +656,9 @@ endif
OBJ += gfx/video_context_driver.o \ OBJ += gfx/video_context_driver.o \
gfx/drivers_context/gfx_null_ctx.o \ gfx/drivers_context/gfx_null_ctx.o \
gfx/video_state_tracker.o gfx/video_state_tracker.o \
libretro-common/gfx/math/matrix_4x4.o \
libretro-common/gfx/math/matrix_3x3.o
ifeq ($(HAVE_KMS), 1) ifeq ($(HAVE_KMS), 1)
HAVE_AND_WILL_USE_DRM = 1 HAVE_AND_WILL_USE_DRM = 1
@ -725,7 +671,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
DEFINES += -DHAVE_OPENGL -DHAVE_GLSL DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
OBJ += gfx/drivers/gl.o \ OBJ += gfx/drivers/gl.o \
gfx/common/gl_common.o \ gfx/common/gl_common.o \
gfx/drivers_font/gl_raster_font.o gfx/drivers_font/gl_raster_font.o \
libretro-common/glsym/rglgen.o
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_gl.o OBJ += menu/drivers_display/menu_display_gl.o
@ -975,7 +922,9 @@ endif
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
OBJ += tasks/task_decompress.o OBJ += libretro-common/file/archive_file.o \
libretro-common/file/archive_file_zlib.o \
tasks/task_decompress.o
OBJ += $(ZLIB_OBJS) OBJ += $(ZLIB_OBJS)
DEFINES += -DHAVE_ZLIB DEFINES += -DHAVE_ZLIB
HAVE_COMPRESSION = 1 HAVE_COMPRESSION = 1
@ -989,20 +938,29 @@ endif
ifeq ($(HAVE_RTGA), 1) ifeq ($(HAVE_RTGA), 1)
DEFINES += -DHAVE_RTGA DEFINES += -DHAVE_RTGA
OBJ += libretro-common/formats/tga/rtga.o
endif endif
ifeq ($(HAVE_RPNG), 1) ifeq ($(HAVE_RPNG), 1)
DEFINES += -DHAVE_RPNG DEFINES += -DHAVE_RPNG
OBJ += libretro-common/formats/png/rpng.o \
libretro-common/formats/png/rpng_encode.o
endif endif
ifeq ($(HAVE_RJPEG), 1) ifeq ($(HAVE_RJPEG), 1)
DEFINES += -DHAVE_RJPEG DEFINES += -DHAVE_RJPEG
OBJ += libretro-common/formats/jpeg/rjpeg.o
endif endif
ifeq ($(HAVE_RBMP), 1) ifeq ($(HAVE_RBMP), 1)
DEFINES += -DHAVE_RBMP DEFINES += -DHAVE_RBMP
OBJ += libretro-common/formats/bmp/rbmp.o
endif endif
OBJ += libretro-common/formats/bmp/rbmp_encode.o \
libretro-common/formats/json/jsonsax.o \
libretro-common/formats/image_transfer.o
ifdef HAVE_COMPRESSION ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION DEFINES += -DHAVE_COMPRESSION
endif endif
@ -1044,11 +1002,19 @@ endif
ifeq ($(HAVE_NETWORKING), 1) ifeq ($(HAVE_NETWORKING), 1)
DEFINES += -DHAVE_NETWORKING DEFINES += -DHAVE_NETWORKING
OBJ += network/net_http_special.o \ OBJ += libretro-common/net/net_compat.o \
tasks/task_http.o libretro-common/net/net_http.o \
libretro-common/net/net_socket.o \
network/net_http_special.o \
tasks/task_http.o
ifneq ($(HAVE_SOCKET_LEGACY),1)
OBJ += libretro-common/net/net_ifinfo.o
endif
ifeq ($(WANT_IFADDRS), 1) ifeq ($(WANT_IFADDRS), 1)
DEFINES += -DWANT_IFADDRS DEFINES += -DWANT_IFADDRS
OBJ += libretro-common/compat/compat_ifaddrs.o
endif endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
@ -1070,7 +1036,7 @@ ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_CHEEVOS), 1) ifeq ($(HAVE_CHEEVOS), 1)
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
DEFINES += -DHAVE_CHEEVOS DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos.o OBJ += cheevos.o libretro-common/utils/md5.o
endif endif
endif endif