diff --git a/Makefile.common b/Makefile.common index 07e239d29c..5e1236c0fc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -39,7 +39,7 @@ ifeq ($(REENTRANT_TEST), 1) OBJ += console/test.o endif -CFLAGS += -I./libretro-sdk/include +CFLAGS += -I./libretro-common/include # Switches @@ -96,12 +96,12 @@ OBJ += frontend/frontend.o \ retroarch.o \ runloop.o \ content.o \ - libretro-sdk/file/file_list.o \ - libretro-sdk/file/dir_list.o \ - libretro-sdk/string/string_list.o \ + libretro-common/file/file_list.o \ + libretro-common/file/dir_list.o \ + libretro-common/string/string_list.o \ file_ops.o \ - libretro-sdk/file//nbio/nbio_stdio.o \ - libretro-sdk/file/file_path.o \ + libretro-common/file//nbio/nbio_stdio.o \ + libretro-common/file/file_path.o \ hash.o \ audio/audio_driver.o \ audio/audio_monitor.o \ @@ -119,7 +119,7 @@ OBJ += frontend/frontend.o \ settings_data.o \ dynamic.o \ dynamic_dummy.o \ - libretro-sdk/queues/message_queue.o \ + libretro-common/queues/message_queue.o \ rewind.o \ gfx/drivers_font_renderer/bitmapfont.o \ input/input_autodetect.o \ @@ -132,22 +132,22 @@ OBJ += frontend/frontend.o \ input/keyboard_line.o \ input/input_overlay.o \ patch.o \ - libretro-sdk/queues/fifo_buffer.o \ + libretro-common/queues/fifo_buffer.o \ core_options.o \ - libretro-sdk/compat/compat.o \ - libretro-sdk/compat/compat_fnmatch.o \ + libretro-common/compat/compat.o \ + libretro-common/compat/compat_fnmatch.o \ cheats.o \ core_info.o \ - libretro-sdk/file/config_file.o \ - libretro-sdk/file/config_file_userdata.o \ + libretro-common/file/config_file.o \ + libretro-common/file/config_file_userdata.o \ screenshot.o \ - libretro-sdk/gfx/scaler/scaler.o \ + libretro-common/gfx/scaler/scaler.o \ gfx/drivers_shader/shader_null.o \ gfx/video_shader_driver.o \ gfx/video_shader_parse.o \ - libretro-sdk/gfx/scaler/pixconv.o \ - libretro-sdk/gfx/scaler/scaler_int.o \ - libretro-sdk/gfx/scaler/scaler_filter.o \ + libretro-common/gfx/scaler/pixconv.o \ + libretro-common/gfx/scaler/scaler_int.o \ + libretro-common/gfx/scaler/scaler_filter.o \ gfx/image/image_rpng.o \ gfx/font_renderer_driver.o \ gfx/video_filter.o \ @@ -322,7 +322,7 @@ ifeq ($(HAVE_FREETYPE), 1) endif ifeq ($(HAVE_THREADS), 1) - OBJ += autosave.o libretro-sdk/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o + OBJ += autosave.o libretro-common/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o DEFINES += -DHAVE_THREADS ifeq ($(findstring Haiku,$(OS)),) LIBS += -lpthread @@ -387,9 +387,9 @@ ifeq ($(HAVE_OPENGL), 1) gfx/drivers_context/gfx_null_ctx.o \ gfx/font_gl_driver.o \ gfx/drivers_font/gl_raster_font.o \ - libretro-sdk/gfx/math/matrix_4x4.o \ + libretro-common/gfx/math/matrix_4x4.o \ gfx/video_state_tracker.o \ - libretro-sdk/glsym/rglgen.o + libretro-common/glsym/rglgen.o ifeq ($(HAVE_KMS), 1) OBJ += gfx/drivers_context/drm_egl_ctx.o @@ -442,10 +442,10 @@ ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_GLES3), 1) DEFINES += -DHAVE_OPENGLES3 endif - OBJ += libretro-sdk/glsym/glsym_es2.o + OBJ += libretro-common/glsym/glsym_es2.o else DEFINES += -DHAVE_GL_SYNC - OBJ += libretro-sdk/glsym/glsym_gl.o + OBJ += libretro-common/glsym/glsym_gl.o ifeq ($(OSX), 1) LIBS += -framework OpenGL else ifneq ($(findstring Win32,$(OS)),) @@ -500,7 +500,7 @@ ifeq ($(HAVE_EXYNOS), 1) endif ifeq ($(HAVE_VG), 1) - OBJ += gfx/drivers/vg.o libretro-sdk/gfx/math/matrix_3x3.o + OBJ += gfx/drivers/vg.o libretro-common/gfx/math/matrix_3x3.o DEFINES += $(VG_CFLAGS) LIBS += $(VG_LIBS) endif @@ -536,7 +536,7 @@ endif #LIBS += $(LIBXML2_LIBS) #DEFINES += $(LIBXML2_CFLAGS) #else - #OBJ += libretro-sdk/formats/xml/rxml.o + #OBJ += libretro-common/formats/xml/rxml.o #endif # Compression/Archive @@ -566,7 +566,7 @@ endif ifeq ($(HAVE_ZLIB), 1) ZLIB_OBJS = decompress/zip_support.o - OBJ += libretro-sdk/formats/png/rpng.o file_extract.o + OBJ += libretro-common/formats/png/rpng.o file_extract.o OBJ += $(ZLIB_OBJS) DEFINES += -DHAVE_ZLIB HAVE_COMPRESSION = 1 diff --git a/Makefile.emscripten b/Makefile.emscripten index 46648d76cd..67638611e6 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -46,7 +46,7 @@ else CFLAGS += -O2 endif -CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-sdk/include -std=gnu99 +CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 all: $(TARGET) @@ -85,7 +85,7 @@ clean: rm -f record/*.o rm -f input/*.o rm -f tools/*.o - rm -f libretro-sdk/*/*.o + rm -f libretro-common/*/*.o rm -f $(TARGET) rm -f *.d diff --git a/Makefile.griffin b/Makefile.griffin index 05241a1882..688b420a99 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -139,7 +139,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) OBJ = griffin/griffin.o $(PLATOBJS) -INCLUDE += -I./libretro-sdk/include +INCLUDE += -I./libretro-common/include ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/Makefile.ps3 b/Makefile.ps3 index 6dc8342f47..1f5b83b43c 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -34,7 +34,7 @@ EBOOT_PATH = ps3/pkg/USRDIR/EBOOT.BIN CORE_PATH = ps3/pkg/USRDIR/cores/CORE.SELF LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-sdk/include +INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-common/include # system platform system_platform = unix diff --git a/Makefile.ps3.rgl b/Makefile.ps3.rgl index 5dfe5ba44d..c2841723d2 100644 --- a/Makefile.ps3.rgl +++ b/Makefile.ps3.rgl @@ -16,7 +16,7 @@ include $(CELL_MK_DIR)/sdk.makedef.mk PPU_LIB_TARGET = librgl_ps3.a LDDIRS = -L. -INCDIRS = -I. -Ips3/gcmgl/include -Ilibretro-sdk/include +INCDIRS = -I. -Ips3/gcmgl/include -Ilibretro-common/include RGL_DIR = ps3/gcmgl/src diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 9f936e83e7..61e1354e27 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -18,8 +18,8 @@ endif STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe -PPU_CFLAGS += -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_driver.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c +PPU_CFLAGS += -I. -Ilibretro-common/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC +PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_driver.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-common/file/file_path.c libretro-common/file/dir_list.c libretro-common/string/string_list.c libretro-common/compat/compat.c libretro-common/file/config_file.c ifeq ($(HAVE_LOGGER), 1) PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger diff --git a/Makefile.psp1 b/Makefile.psp1 index 0757d6c46d..3e3eb235b4 100644 --- a/Makefile.psp1 +++ b/Makefile.psp1 @@ -19,7 +19,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1) WHOLE_END := -Wl,--no-whole-archive endif -INCDIR = $(PSPPATH)/include libretro-sdk/include +INCDIR = $(PSPPATH)/include libretro-common/include CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math ASFLAGS = $(CFLAGS) diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index 2eef884ca2..a5a01061f7 100644 --- a/Makefile.psp1.salamander +++ b/Makefile.psp1.salamander @@ -10,7 +10,7 @@ else OPTIMIZE_LV := -O2 -g endif -INCDIR = $(PSPPATH)/include libretro-sdk/include +INCDIR = $(PSPPATH)/include libretro-common/include CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math ASFLAGS = $(CFLAGS) @@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch PSP_EBOOT_ICON = psp1/ICON0.PNG PSP_EBOOT_PIC1 = psp1/PIC1.PNG -OBJS = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o psp1/kernel_functions.o +OBJS = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o psp1/kernel_functions.o PSPSDK=$(shell psp-config --pspsdk-path) include $(PSPSDK)/lib/build.mak diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 3a164175c6..1dfb38be04 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT) DOL_TARGET := retroarch-salamander_wii.dol ELF_TARGET := retroarch-salamander_wii.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-sdk/include +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float @@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte APP_BOOTER_DIR = wii/app_booter -OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj +OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/Makefile.win b/Makefile.win index 4d51ccfb7e..84f0ad14ca 100644 --- a/Makefile.win +++ b/Makefile.win @@ -85,7 +85,7 @@ OBJ := JOYCONFIG_OBJ := LIBS := -lm JOYCONFIG_LIBS := -DEFINES := -I. -Ilibretro-sdk/include -DRARCH_INTERNAL -DHAVE_OVERLAY +DEFINES := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY LDFLAGS := -L. -static-libgcc include Makefile.common diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index 4c956031c0..e5bc89350a 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -5,9 +5,9 @@ LOCAL_MODULE := retroarch-jni RARCH_DIR := ../../.. LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -DRARCH_INTERNAL LOCAL_LDLIBS := -llog -lz -LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/file_extract.c $(RARCH_DIR)/libretro-sdk/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-sdk/string/string_list.c $(RARCH_DIR)/libretro-sdk/compat/compat.c +LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/file_extract.c $(RARCH_DIR)/libretro-common/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-common/string/string_list.c $(RARCH_DIR)/libretro-common/compat/compat.c -LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-sdk/include/ +LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ include $(BUILD_SHARED_LIBRARY) @@ -64,7 +64,7 @@ LOCAL_CFLAGS += -DHAVE_7ZIP LOCAL_CFLAGS += -O2 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl -LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-sdk/include/ +LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ LOCAL_CFLAGS += -DHAVE_SL LOCAL_LDLIBS += -lOpenSLES -lz diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index cd7881c2d2..365025ba35 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -263,7 +263,7 @@ buildSettings = { ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../libretro-sdk/include", + "$(SRCROOT)/../../libretro-common/include", "$(SRCROOT)/..", ); ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; @@ -277,7 +277,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../libretro-sdk/include", + "$(SRCROOT)/../../libretro-common/include", "$(SRCROOT)/..", ); SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 02dbb4d024..6ca6cb2fd3 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/..", "$(SRCROOT)/../gfx/inc", - "$(SRCROOT)/../libretro-sdk/include", + "$(SRCROOT)/../libretro-common/include", ); INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; @@ -418,7 +418,7 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/..", "$(SRCROOT)/../gfx/inc", - "$(SRCROOT)/../libretro-sdk/include", + "$(SRCROOT)/../libretro-common/include", ); INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/apple/iOS/Makefile b/apple/iOS/Makefile index 5c063eac2a..bf11499fff 100644 --- a/apple/iOS/Makefile +++ b/apple/iOS/Makefile @@ -27,7 +27,7 @@ COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_NETPLAY -DHAVE_RGUI COMMON_FLAGS += -DHAVE_CAMERA COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error COMMON_IOS_OBJCFLAGS := -fobjc-arc -INCFLAGS := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include +INCFLAGS := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-common/include ${APPLICATION_NAME}_CFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS) ${APPLICATION_NAME}_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS) diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index f233fa8af7..2375119a7c 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -495,7 +495,7 @@ GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ( ../, - "../../libretro-sdk/include", + "../../libretro-common/include", ../../, ); INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist"; @@ -558,7 +558,7 @@ GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = ( ../, - "../../libretro-sdk/include", + "../../libretro-common/include", ../../, ); INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist"; diff --git a/audio/test/Makefile b/audio/test/Makefile index 935e75abd7..f17af64da5 100644 --- a/audio/test/Makefile +++ b/audio/test/Makefile @@ -13,7 +13,7 @@ TESTS := test-sinc-lowest \ CFLAGS += -O3 -ffast-math -g -Wall -pedantic -march=native -std=gnu99 CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG -CFLAGS += -I../../libretro-sdk/include -I../../ +CFLAGS += -I../../libretro-common/include -I../../ LDFLAGS += -lm diff --git a/gfx/video_filters/Makefile b/gfx/video_filters/Makefile index d5be50efe1..0149184592 100644 --- a/gfx/video_filters/Makefile +++ b/gfx/video_filters/Makefile @@ -56,8 +56,8 @@ DYLIB = dll endif CC := $(compiler) -CXX := $(subst CC,++,$(compiler)) -std=gnu++0x -flags := -fPIC $(extra_flags) -I../../libretro-sdk/include +CXX := $(subst CC,++,$(compiler)) +flags := -fPIC $(extra_flags) -I../../libretro-common/include asflags := -fPIC $(extra_flags) objects := flags += -std=c99 diff --git a/griffin/griffin.c b/griffin/griffin.c index 19574c3b8b..ad4005eab7 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -66,7 +66,7 @@ PERFORMANCE COMPATIBILITY ============================================================ */ #include "../compat/compat.c" -#include "../libretro-sdk/compat/compat_fnmatch.c" +#include "../libretro-common/compat/compat_fnmatch.c" /*============================================================ CONFIG FILE @@ -77,8 +77,8 @@ CONFIG FILE #undef strcasecmp #endif -#include "../libretro-sdk/file/config_file.c" -#include "../libretro-sdk/file/config_file_userdata.c" +#include "../libretro-common/file/config_file.c" +#include "../libretro-common/file/config_file_userdata.c" #include "../core_options.c" /*============================================================ @@ -180,14 +180,14 @@ VIDEO IMAGE #include "../gfx/image/image_rpng.c" #endif -#include "../libretro-sdk/formats/png/rpng.c" +#include "../libretro-common/formats/png/rpng.c" /*============================================================ VIDEO DRIVER ============================================================ */ #if defined(HAVE_OPENGL) -#include "../libretro-sdk/gfx/math/matrix_4x4.c" +#include "../libretro-common/gfx/math/matrix_4x4.c" #elif defined(GEKKO) #ifdef HW_RVL #include "../wii/vi_encoder.c" @@ -197,7 +197,7 @@ VIDEO DRIVER #ifdef HAVE_VG #include "../gfx/drivers/vg.c" -#include "../libretro-sdk/gfx/math/matrix_3x3.c" +#include "../libretro-common/gfx/math/matrix_3x3.c" #endif #ifdef HAVE_OMAP @@ -213,11 +213,11 @@ VIDEO DRIVER #include "../gfx/gl_common.c" #ifndef HAVE_PSGL -#include "../libretro-sdk/glsym/rglgen.c" +#include "../libretro-common/glsym/rglgen.c" #ifdef HAVE_OPENGLES2 -#include "../libretro-sdk/glsym/glsym_es2.c" +#include "../libretro-common/glsym/glsym_es2.c" #else -#include "../libretro-sdk/glsym/glsym_gl.c" +#include "../libretro-common/glsym/glsym_gl.c" #endif #endif @@ -412,7 +412,7 @@ STATE TRACKER /*============================================================ FIFO BUFFER ============================================================ */ -#include "../libretro-sdk/queues/fifo_buffer.c" +#include "../libretro-common/queues/fifo_buffer.c" /*============================================================ AUDIO RESAMPLER @@ -519,10 +519,10 @@ DRIVERS /*============================================================ SCALERS ============================================================ */ -#include "../libretro-sdk/gfx/scaler/scaler_filter.c" -#include "../libretro-sdk/gfx/scaler/pixconv.c" -#include "../libretro-sdk/gfx/scaler/scaler.c" -#include "../libretro-sdk/gfx/scaler/scaler_int.c" +#include "../libretro-common/gfx/scaler/scaler_filter.c" +#include "../libretro-common/gfx/scaler/pixconv.c" +#include "../libretro-common/gfx/scaler/scaler.c" +#include "../libretro-common/gfx/scaler/scaler_int.c" /*============================================================ FILTERS @@ -562,17 +562,17 @@ DYNAMIC FILE ============================================================ */ #include "../content.c" -#include "../libretro-sdk/file/file_path.c" -#include "../libretro-sdk/file/dir_list.c" -#include "../libretro-sdk/string/string_list.c" +#include "../libretro-common/file/file_path.c" +#include "../libretro-common/file/dir_list.c" +#include "../libretro-common/string/string_list.c" #include "../file_ops.c" -#include "../libretro-sdk/file/nbio/nbio_stdio.c" -#include "../libretro-sdk/file/file_list.c" +#include "../libretro-common/file/nbio/nbio_stdio.c" +#include "../libretro-common/file/file_list.c" /*============================================================ MESSAGE ============================================================ */ -#include "../libretro-sdk/queues/message_queue.c" +#include "../libretro-common/queues/message_queue.c" /*============================================================ PATCH @@ -645,7 +645,7 @@ THREAD #if defined(HAVE_THREADS) && defined(XENON) #include "../thread/xenon_sdl_threads.c" #elif defined(HAVE_THREADS) -#include "../libretro-sdk/rthreads/rthreads.c" +#include "../libretro-common/rthreads/rthreads.c" #include "../gfx/video_thread_wrapper.c" #include "../audio/audio_thread_wrapper.c" #include "../autosave.c" @@ -780,7 +780,7 @@ XML #if 0 #ifndef HAVE_LIBXML2 #define RXML_LIBXML2_COMPAT -#include "../libretro-sdk/formats/xml/rxml.c" +#include "../libretro-common/formats/xml/rxml.c" #endif #endif diff --git a/libretro-sdk/compat/compat.c b/libretro-common/compat/compat.c similarity index 100% rename from libretro-sdk/compat/compat.c rename to libretro-common/compat/compat.c diff --git a/libretro-sdk/compat/compat_fnmatch.c b/libretro-common/compat/compat_fnmatch.c similarity index 100% rename from libretro-sdk/compat/compat_fnmatch.c rename to libretro-common/compat/compat_fnmatch.c diff --git a/libretro-sdk/compat/win32/dirent.c b/libretro-common/compat/win32/dirent.c similarity index 100% rename from libretro-sdk/compat/win32/dirent.c rename to libretro-common/compat/win32/dirent.c diff --git a/libretro-sdk/crt/include/string.h b/libretro-common/crt/include/string.h similarity index 100% rename from libretro-sdk/crt/include/string.h rename to libretro-common/crt/include/string.h diff --git a/libretro-sdk/crt/string.c b/libretro-common/crt/string.c similarity index 100% rename from libretro-sdk/crt/string.c rename to libretro-common/crt/string.c diff --git a/libretro-sdk/file/config_file.c b/libretro-common/file/config_file.c similarity index 100% rename from libretro-sdk/file/config_file.c rename to libretro-common/file/config_file.c diff --git a/libretro-sdk/file/config_file_userdata.c b/libretro-common/file/config_file_userdata.c similarity index 100% rename from libretro-sdk/file/config_file_userdata.c rename to libretro-common/file/config_file_userdata.c diff --git a/libretro-sdk/file/dir_list.c b/libretro-common/file/dir_list.c similarity index 100% rename from libretro-sdk/file/dir_list.c rename to libretro-common/file/dir_list.c diff --git a/libretro-sdk/file/file_list.c b/libretro-common/file/file_list.c similarity index 100% rename from libretro-sdk/file/file_list.c rename to libretro-common/file/file_list.c diff --git a/libretro-sdk/file/file_path.c b/libretro-common/file/file_path.c similarity index 100% rename from libretro-sdk/file/file_path.c rename to libretro-common/file/file_path.c diff --git a/libretro-sdk/file/memory_stream.c b/libretro-common/file/memory_stream.c similarity index 100% rename from libretro-sdk/file/memory_stream.c rename to libretro-common/file/memory_stream.c diff --git a/libretro-sdk/file/nbio/Makefile b/libretro-common/file/nbio/Makefile similarity index 100% rename from libretro-sdk/file/nbio/Makefile rename to libretro-common/file/nbio/Makefile diff --git a/libretro-sdk/file/nbio/nbio_stdio.c b/libretro-common/file/nbio/nbio_stdio.c similarity index 100% rename from libretro-sdk/file/nbio/nbio_stdio.c rename to libretro-common/file/nbio/nbio_stdio.c diff --git a/libretro-sdk/file/nbio/nbio_test.c b/libretro-common/file/nbio/nbio_test.c similarity index 100% rename from libretro-sdk/file/nbio/nbio_test.c rename to libretro-common/file/nbio/nbio_test.c diff --git a/libretro-sdk/formats/mpng/mpng_decode.c b/libretro-common/formats/mpng/mpng_decode.c similarity index 100% rename from libretro-sdk/formats/mpng/mpng_decode.c rename to libretro-common/formats/mpng/mpng_decode.c diff --git a/libretro-sdk/formats/png/Makefile b/libretro-common/formats/png/Makefile similarity index 100% rename from libretro-sdk/formats/png/Makefile rename to libretro-common/formats/png/Makefile diff --git a/libretro-sdk/formats/png/rpng.c b/libretro-common/formats/png/rpng.c similarity index 100% rename from libretro-sdk/formats/png/rpng.c rename to libretro-common/formats/png/rpng.c diff --git a/libretro-sdk/formats/png/rpng_test.c b/libretro-common/formats/png/rpng_test.c similarity index 100% rename from libretro-sdk/formats/png/rpng_test.c rename to libretro-common/formats/png/rpng_test.c diff --git a/libretro-sdk/formats/xml/Makefile b/libretro-common/formats/xml/Makefile similarity index 100% rename from libretro-sdk/formats/xml/Makefile rename to libretro-common/formats/xml/Makefile diff --git a/libretro-sdk/formats/xml/rxml.c b/libretro-common/formats/xml/rxml.c similarity index 100% rename from libretro-sdk/formats/xml/rxml.c rename to libretro-common/formats/xml/rxml.c diff --git a/libretro-sdk/formats/xml/rxml_test.c b/libretro-common/formats/xml/rxml_test.c similarity index 100% rename from libretro-sdk/formats/xml/rxml_test.c rename to libretro-common/formats/xml/rxml_test.c diff --git a/libretro-sdk/gfx/math/matrix_3x3.c b/libretro-common/gfx/math/matrix_3x3.c similarity index 100% rename from libretro-sdk/gfx/math/matrix_3x3.c rename to libretro-common/gfx/math/matrix_3x3.c diff --git a/libretro-sdk/gfx/math/matrix_4x4.c b/libretro-common/gfx/math/matrix_4x4.c similarity index 100% rename from libretro-sdk/gfx/math/matrix_4x4.c rename to libretro-common/gfx/math/matrix_4x4.c diff --git a/libretro-sdk/gfx/scaler/pixconv.c b/libretro-common/gfx/scaler/pixconv.c similarity index 100% rename from libretro-sdk/gfx/scaler/pixconv.c rename to libretro-common/gfx/scaler/pixconv.c diff --git a/libretro-sdk/gfx/scaler/scaler.c b/libretro-common/gfx/scaler/scaler.c similarity index 100% rename from libretro-sdk/gfx/scaler/scaler.c rename to libretro-common/gfx/scaler/scaler.c diff --git a/libretro-sdk/gfx/scaler/scaler_filter.c b/libretro-common/gfx/scaler/scaler_filter.c similarity index 100% rename from libretro-sdk/gfx/scaler/scaler_filter.c rename to libretro-common/gfx/scaler/scaler_filter.c diff --git a/libretro-sdk/gfx/scaler/scaler_int.c b/libretro-common/gfx/scaler/scaler_int.c similarity index 100% rename from libretro-sdk/gfx/scaler/scaler_int.c rename to libretro-common/gfx/scaler/scaler_int.c diff --git a/libretro-sdk/glsym/README.md b/libretro-common/glsym/README.md similarity index 100% rename from libretro-sdk/glsym/README.md rename to libretro-common/glsym/README.md diff --git a/libretro-sdk/glsym/glgen.py b/libretro-common/glsym/glgen.py similarity index 100% rename from libretro-sdk/glsym/glgen.py rename to libretro-common/glsym/glgen.py diff --git a/libretro-sdk/glsym/glsym_es2.c b/libretro-common/glsym/glsym_es2.c similarity index 100% rename from libretro-sdk/glsym/glsym_es2.c rename to libretro-common/glsym/glsym_es2.c diff --git a/libretro-sdk/glsym/glsym_gl.c b/libretro-common/glsym/glsym_gl.c similarity index 100% rename from libretro-sdk/glsym/glsym_gl.c rename to libretro-common/glsym/glsym_gl.c diff --git a/libretro-sdk/glsym/rglgen.c b/libretro-common/glsym/rglgen.c similarity index 100% rename from libretro-sdk/glsym/rglgen.c rename to libretro-common/glsym/rglgen.c diff --git a/libretro-sdk/include/boolean.h b/libretro-common/include/boolean.h similarity index 100% rename from libretro-sdk/include/boolean.h rename to libretro-common/include/boolean.h diff --git a/libretro-sdk/include/clamping.h b/libretro-common/include/clamping.h similarity index 100% rename from libretro-sdk/include/clamping.h rename to libretro-common/include/clamping.h diff --git a/libretro-sdk/include/compat/apple_compat.h b/libretro-common/include/compat/apple_compat.h similarity index 100% rename from libretro-sdk/include/compat/apple_compat.h rename to libretro-common/include/compat/apple_compat.h diff --git a/libretro-sdk/include/compat/fnmatch.h b/libretro-common/include/compat/fnmatch.h similarity index 100% rename from libretro-sdk/include/compat/fnmatch.h rename to libretro-common/include/compat/fnmatch.h diff --git a/libretro-sdk/include/compat/getopt.h b/libretro-common/include/compat/getopt.h similarity index 100% rename from libretro-sdk/include/compat/getopt.h rename to libretro-common/include/compat/getopt.h diff --git a/libretro-sdk/include/compat/msvc.h b/libretro-common/include/compat/msvc.h similarity index 100% rename from libretro-sdk/include/compat/msvc.h rename to libretro-common/include/compat/msvc.h diff --git a/libretro-sdk/include/compat/msvc/stdint.h b/libretro-common/include/compat/msvc/stdint.h similarity index 100% rename from libretro-sdk/include/compat/msvc/stdint.h rename to libretro-common/include/compat/msvc/stdint.h diff --git a/libretro-sdk/include/compat/posix_string.h b/libretro-common/include/compat/posix_string.h similarity index 100% rename from libretro-sdk/include/compat/posix_string.h rename to libretro-common/include/compat/posix_string.h diff --git a/libretro-sdk/include/compat/strcasestr.h b/libretro-common/include/compat/strcasestr.h similarity index 100% rename from libretro-sdk/include/compat/strcasestr.h rename to libretro-common/include/compat/strcasestr.h diff --git a/libretro-sdk/include/compat/strl.h b/libretro-common/include/compat/strl.h similarity index 100% rename from libretro-sdk/include/compat/strl.h rename to libretro-common/include/compat/strl.h diff --git a/libretro-sdk/include/compat/win32/dirent.h b/libretro-common/include/compat/win32/dirent.h similarity index 100% rename from libretro-sdk/include/compat/win32/dirent.h rename to libretro-common/include/compat/win32/dirent.h diff --git a/libretro-sdk/include/file/config_file.h b/libretro-common/include/file/config_file.h similarity index 100% rename from libretro-sdk/include/file/config_file.h rename to libretro-common/include/file/config_file.h diff --git a/libretro-sdk/include/file/config_file_macros.h b/libretro-common/include/file/config_file_macros.h similarity index 100% rename from libretro-sdk/include/file/config_file_macros.h rename to libretro-common/include/file/config_file_macros.h diff --git a/libretro-sdk/include/file/config_file_userdata.h b/libretro-common/include/file/config_file_userdata.h similarity index 100% rename from libretro-sdk/include/file/config_file_userdata.h rename to libretro-common/include/file/config_file_userdata.h diff --git a/libretro-sdk/include/file/dir_list.h b/libretro-common/include/file/dir_list.h similarity index 100% rename from libretro-sdk/include/file/dir_list.h rename to libretro-common/include/file/dir_list.h diff --git a/libretro-sdk/include/file/file_list.h b/libretro-common/include/file/file_list.h similarity index 100% rename from libretro-sdk/include/file/file_list.h rename to libretro-common/include/file/file_list.h diff --git a/libretro-sdk/include/file/file_path.h b/libretro-common/include/file/file_path.h similarity index 100% rename from libretro-sdk/include/file/file_path.h rename to libretro-common/include/file/file_path.h diff --git a/libretro-sdk/include/file/memory_stream.h b/libretro-common/include/file/memory_stream.h similarity index 100% rename from libretro-sdk/include/file/memory_stream.h rename to libretro-common/include/file/memory_stream.h diff --git a/libretro-sdk/include/file/nbio.h b/libretro-common/include/file/nbio.h similarity index 100% rename from libretro-sdk/include/file/nbio.h rename to libretro-common/include/file/nbio.h diff --git a/libretro-sdk/include/formats/mpng.h b/libretro-common/include/formats/mpng.h similarity index 100% rename from libretro-sdk/include/formats/mpng.h rename to libretro-common/include/formats/mpng.h diff --git a/libretro-sdk/include/formats/rpng.h b/libretro-common/include/formats/rpng.h similarity index 100% rename from libretro-sdk/include/formats/rpng.h rename to libretro-common/include/formats/rpng.h diff --git a/libretro-sdk/include/formats/rxml.h b/libretro-common/include/formats/rxml.h similarity index 100% rename from libretro-sdk/include/formats/rxml.h rename to libretro-common/include/formats/rxml.h diff --git a/libretro-sdk/include/gfx/math/matrix_3x3.h b/libretro-common/include/gfx/math/matrix_3x3.h similarity index 100% rename from libretro-sdk/include/gfx/math/matrix_3x3.h rename to libretro-common/include/gfx/math/matrix_3x3.h diff --git a/libretro-sdk/include/gfx/math/matrix_4x4.h b/libretro-common/include/gfx/math/matrix_4x4.h similarity index 100% rename from libretro-sdk/include/gfx/math/matrix_4x4.h rename to libretro-common/include/gfx/math/matrix_4x4.h diff --git a/libretro-sdk/include/gfx/scaler/filter.h b/libretro-common/include/gfx/scaler/filter.h similarity index 100% rename from libretro-sdk/include/gfx/scaler/filter.h rename to libretro-common/include/gfx/scaler/filter.h diff --git a/libretro-sdk/include/gfx/scaler/pixconv.h b/libretro-common/include/gfx/scaler/pixconv.h similarity index 100% rename from libretro-sdk/include/gfx/scaler/pixconv.h rename to libretro-common/include/gfx/scaler/pixconv.h diff --git a/libretro-sdk/include/gfx/scaler/scaler.h b/libretro-common/include/gfx/scaler/scaler.h similarity index 100% rename from libretro-sdk/include/gfx/scaler/scaler.h rename to libretro-common/include/gfx/scaler/scaler.h diff --git a/libretro-sdk/include/gfx/scaler/scaler_int.h b/libretro-common/include/gfx/scaler/scaler_int.h similarity index 100% rename from libretro-sdk/include/gfx/scaler/scaler_int.h rename to libretro-common/include/gfx/scaler/scaler_int.h diff --git a/libretro-sdk/include/glsym/glsym.h b/libretro-common/include/glsym/glsym.h similarity index 100% rename from libretro-sdk/include/glsym/glsym.h rename to libretro-common/include/glsym/glsym.h diff --git a/libretro-sdk/include/glsym/glsym_es2.h b/libretro-common/include/glsym/glsym_es2.h similarity index 100% rename from libretro-sdk/include/glsym/glsym_es2.h rename to libretro-common/include/glsym/glsym_es2.h diff --git a/libretro-sdk/include/glsym/glsym_gl.h b/libretro-common/include/glsym/glsym_gl.h similarity index 100% rename from libretro-sdk/include/glsym/glsym_gl.h rename to libretro-common/include/glsym/glsym_gl.h diff --git a/libretro-sdk/include/glsym/rglgen.h b/libretro-common/include/glsym/rglgen.h similarity index 100% rename from libretro-sdk/include/glsym/rglgen.h rename to libretro-common/include/glsym/rglgen.h diff --git a/libretro-sdk/include/glsym/rglgen_headers.h b/libretro-common/include/glsym/rglgen_headers.h similarity index 100% rename from libretro-sdk/include/glsym/rglgen_headers.h rename to libretro-common/include/glsym/rglgen_headers.h diff --git a/libretro-sdk/include/libco.h b/libretro-common/include/libco.h similarity index 100% rename from libretro-sdk/include/libco.h rename to libretro-common/include/libco.h diff --git a/libretro-sdk/include/queues/fifo_buffer.h b/libretro-common/include/queues/fifo_buffer.h similarity index 100% rename from libretro-sdk/include/queues/fifo_buffer.h rename to libretro-common/include/queues/fifo_buffer.h diff --git a/libretro-sdk/include/queues/message_queue.h b/libretro-common/include/queues/message_queue.h similarity index 100% rename from libretro-sdk/include/queues/message_queue.h rename to libretro-common/include/queues/message_queue.h diff --git a/libretro-sdk/include/retro_endianness.h b/libretro-common/include/retro_endianness.h similarity index 100% rename from libretro-sdk/include/retro_endianness.h rename to libretro-common/include/retro_endianness.h diff --git a/libretro-sdk/include/retro_inline.h b/libretro-common/include/retro_inline.h similarity index 100% rename from libretro-sdk/include/retro_inline.h rename to libretro-common/include/retro_inline.h diff --git a/libretro-sdk/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h similarity index 100% rename from libretro-sdk/include/retro_miscellaneous.h rename to libretro-common/include/retro_miscellaneous.h diff --git a/libretro-sdk/include/rthreads/rthreads.h b/libretro-common/include/rthreads/rthreads.h similarity index 100% rename from libretro-sdk/include/rthreads/rthreads.h rename to libretro-common/include/rthreads/rthreads.h diff --git a/libretro-sdk/include/string/string_list.h b/libretro-common/include/string/string_list.h similarity index 100% rename from libretro-sdk/include/string/string_list.h rename to libretro-common/include/string/string_list.h diff --git a/libretro-sdk/libco/amd64.c b/libretro-common/libco/amd64.c similarity index 100% rename from libretro-sdk/libco/amd64.c rename to libretro-common/libco/amd64.c diff --git a/libretro-sdk/libco/armeabi.c b/libretro-common/libco/armeabi.c similarity index 100% rename from libretro-sdk/libco/armeabi.c rename to libretro-common/libco/armeabi.c diff --git a/libretro-sdk/libco/fiber.c b/libretro-common/libco/fiber.c similarity index 100% rename from libretro-sdk/libco/fiber.c rename to libretro-common/libco/fiber.c diff --git a/libretro-sdk/libco/libco.c b/libretro-common/libco/libco.c similarity index 100% rename from libretro-sdk/libco/libco.c rename to libretro-common/libco/libco.c diff --git a/libretro-sdk/libco/ppc.c b/libretro-common/libco/ppc.c similarity index 100% rename from libretro-sdk/libco/ppc.c rename to libretro-common/libco/ppc.c diff --git a/libretro-sdk/libco/sjlj.c b/libretro-common/libco/sjlj.c similarity index 100% rename from libretro-sdk/libco/sjlj.c rename to libretro-common/libco/sjlj.c diff --git a/libretro-sdk/libco/ucontext.c b/libretro-common/libco/ucontext.c similarity index 100% rename from libretro-sdk/libco/ucontext.c rename to libretro-common/libco/ucontext.c diff --git a/libretro-sdk/libco/x86.c b/libretro-common/libco/x86.c similarity index 100% rename from libretro-sdk/libco/x86.c rename to libretro-common/libco/x86.c diff --git a/libretro-sdk/queues/fifo_buffer.c b/libretro-common/queues/fifo_buffer.c similarity index 100% rename from libretro-sdk/queues/fifo_buffer.c rename to libretro-common/queues/fifo_buffer.c diff --git a/libretro-sdk/queues/message_queue.c b/libretro-common/queues/message_queue.c similarity index 100% rename from libretro-sdk/queues/message_queue.c rename to libretro-common/queues/message_queue.c diff --git a/libretro-sdk/rthreads/gx_pthread.h b/libretro-common/rthreads/gx_pthread.h similarity index 100% rename from libretro-sdk/rthreads/gx_pthread.h rename to libretro-common/rthreads/gx_pthread.h diff --git a/libretro-sdk/rthreads/psp_pthread.h b/libretro-common/rthreads/psp_pthread.h similarity index 100% rename from libretro-sdk/rthreads/psp_pthread.h rename to libretro-common/rthreads/psp_pthread.h diff --git a/libretro-sdk/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c similarity index 100% rename from libretro-sdk/rthreads/rthreads.c rename to libretro-common/rthreads/rthreads.c diff --git a/libretro-sdk/rthreads/xenon_sdl_threads.c b/libretro-common/rthreads/xenon_sdl_threads.c similarity index 100% rename from libretro-sdk/rthreads/xenon_sdl_threads.c rename to libretro-common/rthreads/xenon_sdl_threads.c diff --git a/libretro-sdk/string/string_list.c b/libretro-common/string/string_list.c similarity index 100% rename from libretro-sdk/string/string_list.c rename to libretro-common/string/string_list.c diff --git a/libretro-test-gl/Makefile b/libretro-test-gl/Makefile index bf22b5d08c..26e246926d 100644 --- a/libretro-test-gl/Makefile +++ b/libretro-test-gl/Makefile @@ -95,7 +95,7 @@ else CFLAGS += -std=gnu99 endif -OBJECTS := libretro-test.o ../libretro-sdk/glsym/rglgen.o +OBJECTS := libretro-test.o ../libretro-common/glsym/rglgen.o CFLAGS += -Wall -pedantic $(fpic) ifeq ($(GLES), 1) @@ -106,9 +106,9 @@ ifeq ($(GLES), 1) CFLAGS += -DHAVE_OPENGLES3 -DGLES3 endif LIBS += -lGLESv2 # Still link against GLESv2 when using GLES3 API, at least on desktop Linux. - OBJECTS += ../libretro-sdk/glsym/glsym_es2.o + OBJECTS += ../libretro-common/glsym/glsym_es2.o else - OBJECTS += ../libretro-sdk/glsym/glsym_gl.o + OBJECTS += ../libretro-common/glsym/glsym_gl.o LIBS += $(GL_LIB) endif @@ -122,7 +122,7 @@ $(TARGET): $(OBJECTS) $(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_GL_LIBS) %.o: %.c - $(CC) -I../libretro-sdk/include $(CFLAGS) -c -o $@ $< + $(CC) -I../libretro-common/include $(CFLAGS) -c -o $@ $< clean: rm -f $(OBJECTS) $(TARGET) diff --git a/libretro-test-gl/libretro-test.c b/libretro-test-gl/libretro-test.c index d5de151f19..e5e07a05cd 100644 --- a/libretro-test-gl/libretro-test.c +++ b/libretro-test-gl/libretro-test.c @@ -8,7 +8,7 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) static struct retro_hw_render_callback hw_render; -#include "../libretro-sdk/include/glsym/glsym.h" +#include "../libretro-common/include/glsym/glsym.h" #define BASE_WIDTH 320 #define BASE_HEIGHT 240 diff --git a/libretrodb/Makefile b/libretrodb/Makefile index aeeec3f7d0..a739ba40d5 100644 --- a/libretrodb/Makefile +++ b/libretrodb/Makefile @@ -1,5 +1,5 @@ CFLAGS = -g -INCFLAGS = -I. -I../libretro-sdk/include +INCFLAGS = -I. -I../libretro-common/include LUA_CONVERTER_OBJ = rmsgpack.o \ rmsgpack_dom.o \ diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj index a5d4692c3d..2600de7daf 100644 --- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj +++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj @@ -115,7 +115,7 @@ MultiThreadedDebug _DEBUG;_XBOX;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC Callcap - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -139,7 +139,7 @@ MultiThreadedDebug _DEBUG;_XBOX;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC Callcap - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -164,7 +164,7 @@ MultiThreaded NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC Callcap - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -193,7 +193,7 @@ false MultiThreaded NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -220,7 +220,7 @@ false MultiThreaded NDEBUG;_XBOX;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -247,7 +247,7 @@ false MultiThreaded NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;_XBOX360;IS_SALAMANDER;HAVE_RARCH_EXEC - $(SolutionDir)\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\libretro-common\include;%(AdditionalIncludeDirectories) true @@ -262,7 +262,7 @@ - + CompileAsC CompileAsC CompileAsC @@ -270,7 +270,7 @@ CompileAsC CompileAsC - + CompileAsC CompileAsC CompileAsC @@ -278,7 +278,7 @@ CompileAsC CompileAsC - + CompileAsC CompileAsC CompileAsC @@ -286,7 +286,7 @@ CompileAsC CompileAsC - + CompileAsC CompileAsC CompileAsC @@ -298,7 +298,7 @@ - + CompileAsC CompileAsC CompileAsC diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters index f40692586a..0da510f5a0 100644 --- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters +++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters @@ -9,13 +9,13 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd - + {f4a792cf-e151-4c18-90e8-937df3d3562a} - + {442ff913-d338-430f-8b84-57bd7d4117db} - + {b4898f5c-14c7-4816-88fa-c27a52e45e84} @@ -32,20 +32,20 @@ Source Files - - Source Files\libretro-sdk\compat + + Source Files\libretro-common\compat - - Source Files\libretro-sdk\file + + Source Files\libretro-common\file - - Source Files\libretro-sdk\file + + Source Files\libretro-common\file - - Source Files\libretro-sdk\file + + Source Files\libretro-common\file - - Source Files\libretro-sdk\file + + Source Files\libretro-common\file - \ No newline at end of file + diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj index 5ca8c859c4..0ce9b6904d 100644 --- a/msvc/RetroArch-360/RetroArch-360.vcxproj +++ b/msvc/RetroArch-360/RetroArch-360.vcxproj @@ -115,7 +115,7 @@ MultiThreadedDebug _DEBUG;_XBOX;HAVE_XINPUT2;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -154,7 +154,7 @@ MultiThreadedDebug _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -194,7 +194,7 @@ MultiThreaded NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN Callcap - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -238,7 +238,7 @@ false MultiThreaded NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -280,7 +280,7 @@ false MultiThreaded NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_RMENU_XUI;HAVE_MENU;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -322,7 +322,7 @@ false MultiThreaded NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;HAVE_RMENU_XUI;HAVE_MENU;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_D3D9;RARCH_INTERNAL;MSB_FIRST;_XBOX360;WANT_MINIZ;SINC_LOWER_QUALITY;HAVE_XAUDIO;WANT_RPNG;HAVE_THREADS;HAVE_BUILTIN_AUTOCONFIG;HAVE_FILTERS_BUILTIN - $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-sdk\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) + $(SolutionDir)\..\deps\rzlib;$(SolutionDir)\..\libretro-common\include;$(SolutionDir)\..\;%(AdditionalIncludeDirectories) true @@ -437,4 +437,4 @@ - \ No newline at end of file + diff --git a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj index a83285970e..9b30454902 100644 --- a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj +++ b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj @@ -20,7 +20,7 @@ Name="VCCLCompilerTool" Optimization="0" OptimizeForProcessor="2" - AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-sdk\include";"$(SolutionDir)\msvc-71"" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-71"" PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;IS_SALAMANDER;RARCH_CONSOLE;HAVE_RARCH_EXEC" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -68,7 +68,7 @@ Optimization="3" OmitFramePointers="TRUE" OptimizeForProcessor="2" - AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-sdk\include";"$(SolutionDir)\msvc-71"" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-71"" PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;IS_SALAMANDER;RARCH_CONSOLE;HAVE_RARCH_EXEC" StringPooling="TRUE" RuntimeLibrary="0" @@ -120,7 +120,7 @@ Optimization="3" OmitFramePointers="TRUE" OptimizeForProcessor="2" - AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-sdk\include";"$(SolutionDir)\msvc-71"" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-71"" PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;FASTCAP;IS_SALAMANDER;RARCH_CONSOLE;HAVE_RARCH_EXEC" StringPooling="TRUE" RuntimeLibrary="0" @@ -173,7 +173,7 @@ Optimization="3" OmitFramePointers="TRUE" OptimizeForProcessor="2" - AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-sdk\include";"$(SolutionDir)\msvc-71"" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-71"" PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;IS_SALAMANDER;RARCH_CONSOLE;HAVE_RARCH_EXEC" StringPooling="TRUE" RuntimeLibrary="0" @@ -225,7 +225,7 @@ Optimization="3" OmitFramePointers="TRUE" OptimizeForProcessor="2" - AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-sdk\include";"$(SolutionDir)\msvc-71"" + AdditionalIncludeDirectories=""$(SolutionDir)\msvc-stdint";"$(SolutionDir)\..\libretro-common\include";"$(SolutionDir)\msvc-71"" PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;LTCG;IS_SALAMANDER;RARCH_CONSOLE;HAVE_RARCH_EXEC" StringPooling="TRUE" RuntimeLibrary="0" @@ -375,23 +375,23 @@ + RelativePath="..\..\libretro-common\compat\compat.c"> + RelativePath="..\..\libretro-common\file\config_file.c"> + RelativePath="..\..\libretro-common\file\dir_list.c"> + RelativePath="..\..\libretro-common\file\file_path.c"> + RelativePath="..\..\libretro-common\string\string_list.c"> Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -121,7 +121,7 @@ Level3 Disabled WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;HAVE_ZLIB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreadedDebug CompileAsCpp Fast @@ -143,7 +143,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast @@ -168,7 +168,7 @@ true true WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_ZLIB;WANT_MINIZ;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-common\include;%(AdditionalIncludeDirectories) MultiThreaded CompileAsCpp Fast diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c index 47ca9ba247..9cf1fabd9f 100644 --- a/tools/retroarch-joyconfig-griffin.c +++ b/tools/retroarch-joyconfig-griffin.c @@ -41,10 +41,10 @@ #include "../input/drivers_joypad/sdl_joypad.c" #endif -#include "../libretro-sdk/file/config_file.c" -#include "../libretro-sdk/file/file_path.c" -#include "../libretro-sdk/string/string_list.c" -#include "../libretro-sdk/compat/compat.c" +#include "../libretro-common/file/config_file.c" +#include "../libretro-common/file/file_path.c" +#include "../libretro-common/string/string_list.c" +#include "../libretro-common/compat/compat.c" #include "../input/drivers/nullinput.c" #include "../input/drivers_joypad/nullinput_joypad.c" @@ -54,4 +54,4 @@ #include "../input/input_common.c" #include "../input/input_keymaps.c" -#include "../libretro-sdk/queues/message_queue.c" +#include "../libretro-common/queues/message_queue.c" diff --git a/wii/app_booter/Makefile b/wii/app_booter/Makefile index 3e1596b893..b286f3b4ff 100644 --- a/wii/app_booter/Makefile +++ b/wii/app_booter/Makefile @@ -21,7 +21,7 @@ OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT) BIN_TARGET := app_booter.bin ELF_TARGET := app_booter.elf -INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I../../libretro-sdk/crt/include +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I../../libretro-common/crt/include LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii MACHDEP := -DHW_RVL -DGEKKO -mno-eabi -mno-sdata -mcpu=750 @@ -30,7 +30,7 @@ CFLAGS += -Wall -O2 -ffreestanding -std=gnu99 $(MACHDEP) $(INCLUDE) LDFLAGS := -T link.ld -OBJ = crt0.o dolloader.o elfloader.o main.o ../../libretro-sdk/crt/string.o sync.o +OBJ = crt0.o dolloader.o elfloader.o main.o ../../libretro-common/crt/string.o sync.o all: $(BIN_TARGET)