From ec5532844822c79f46f21e5b042f83557c28fc91 Mon Sep 17 00:00:00 2001 From: hunterk Date: Wed, 12 Jul 2017 20:55:24 -0500 Subject: [PATCH] revert changes and reapply commits since then --- Makefile.libretro | 80 +++++- libretro/Makefile.common | 6 +- libretro/jni/Android.mk | 1 + libretro/libretro.c | 109 ++++---- libretro/msvc/msvc-2010.bat | 124 --------- libretro/msvc/msvc-2010.sln | 20 -- libretro/msvc/msvc-2010/libretro.def | 27 -- libretro/msvc/msvc-2010/msvc-2010.vcxproj | 150 ----------- .../msvc/msvc-2010/msvc-2010.vcxproj.filters | 241 ------------------ 9 files changed, 125 insertions(+), 633 deletions(-) delete mode 100644 libretro/msvc/msvc-2010.bat delete mode 100644 libretro/msvc/msvc-2010.sln delete mode 100644 libretro/msvc/msvc-2010/libretro.def delete mode 100644 libretro/msvc/msvc-2010/msvc-2010.vcxproj delete mode 100644 libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters diff --git a/Makefile.libretro b/Makefile.libretro index 5c95884..4cfbb03 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -27,7 +27,7 @@ endif TARGET_NAME := genesis_plus_gx -LIBM := -lm +LIBS := -lm GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)" ifneq ($(GIT_VERSION)," unknown") @@ -62,7 +62,7 @@ else ifeq ($(platform), linux-portable) SHARED := -shared -Wl,--version-script=libretro/link.T ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN PLATFORM_DEFINES := -DHAVE_ZLIB - LIBM := + LIBS = # OS X else ifeq ($(platform), osx) @@ -235,7 +235,54 @@ else ifeq ($(platform), gcw0) LDFLAGS += $(PTHREAD_FLAGS) CFLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float +# Windows MSVC 2010 x64 +else ifeq ($(platform), windows_msvc2010_x64) + CC = cl.exe + CXX = cl.exe +PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin/amd64"):$(PATH) +PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE") +LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64") +INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") + +WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 +WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 + +WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include +WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include + + +INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)" +export INCLUDE := $(INCLUDE) +export LIB := $(LIB);$(WindowsSdkDir) +TARGET := $(TARGET_NAME)_libretro.dll +PSS_STYLE :=2 +LDFLAGS += -DLL +LIBS = +# Windows MSVC 2010 x86 +else ifeq ($(platform), windows_msvc2010_x86) + CC = cl.exe + CXX = cl.exe + +PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin"):$(PATH) +PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE") +LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib") +INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") + +WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib +WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib + +WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include +WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include + + +INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)" +export INCLUDE := $(INCLUDE) +export LIB := $(LIB);$(WindowsSdkDir) +TARGET := $(TARGET_NAME)_libretro.dll +PSS_STYLE :=2 +LDFLAGS += -DLL +LIBS = # Windows else TARGET := $(TARGET_NAME)_libretro.dll @@ -247,19 +294,15 @@ else endif -LDFLAGS += $(LIBM) +LDFLAGS += $(LIBS) ifeq ($(SHARED_LIBVORBIS), 1) LDFLAGS += -lvorbisfile endif ifeq ($(DEBUG), 1) CFLAGS += -O0 -g -else ifeq ($(platform),qnx) - CFLAGS += -Os -DNDEBUG -else ifeq ($(platform), emscripten) - CFLAGS += -O2 -DNDEBUG else - CFLAGS += -O3 -DNDEBUG + CFLAGS += -O2 -DNDEBUG endif CORE_DIR := . @@ -292,18 +335,29 @@ else endif -LIBRETRO_CFLAGS += $(INCFLAGS) +LIBRETRO_CFLAGS += $(INCFLAGS) $(INCFLAGS_PLATFORM) LIBRETRO_CFLAGS += $(BPP_DEFINES) \ $(ENDIANNESS_DEFINES) \ $(PLATFORM_DEFINES) \ -D__LIBRETRO__ -ifeq ($(platform), qnx) - LIBRETRO_CFLAGS += -D__inline__=inline +ifneq (,$(findstring msvc,$(platform))) + LIBRETRO_CFLAGS += -DINLINE="static _inline" else LIBRETRO_CFLAGS += -DINLINE="static inline" endif +OBJOUT = -o +LINKOUT = -o + +ifneq (,$(findstring msvc,$(platform))) + OBJOUT = -Fo + LINKOUT = -out: + LD = link.exe +else + LD = $(CC) +endif + ifeq ($(platform), theos_ios) COMMON_FLAGS := $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error $(LIBRARY_NAME)_CFLAGS += $(CFLAGS) $(LIBRETRO_CFLAGS) $(COMMON_FLAGS) @@ -314,13 +368,13 @@ else all: $(TARGET) %.o: %.c - $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) $(LIBRETRO_CFLAGS) + $(CC) $(OBJOUT)$@ -c $< $(CPPFLAGS) $(CFLAGS) $(LIBRETRO_CFLAGS) $(TARGET): $(OBJECTS) ifeq ($(STATIC_LINKING), 1) $(AR) rcs $@ $(OBJECTS) else - $(CC) -o $(TARGET) $(fpic) $(OBJECTS) $(LDFLAGS) $(SHARED) + $(LD) $(LINKOUT)$(TARGET) $(fpic) $(OBJECTS) $(LDFLAGS) $(SHARED) $(LIBS) endif clean-objs: diff --git a/libretro/Makefile.common b/libretro/Makefile.common index acb620a..a9bc2bf 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -10,6 +10,10 @@ GENPLUS_SRC_DIR := $(CORE_DIR)/core \ SOURCES_C = $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) +ifneq ($(STATIC_LINKING), 1) +SOURCES_C += $(CORE_DIR)/libretro-common/streams/file_stream.c +endif + ifeq ($(SHARED_LIBVORBIS),) SOURCES_C += $(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) endif @@ -18,4 +22,4 @@ SOURCES_C += $(LIBRETRO_DIR)/libretro.c SOURCES_C += $(LIBRETRO_DIR)/scrc32.c -INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR) +INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR) -I$(CORE_DIR)/libretro-common/include diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index 00a6ebd..79f2ca9 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -26,6 +26,7 @@ include $(LIBRETRO_DIR)/Makefile.common LOCAL_SRC_FILES := $(SOURCES_C) LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \ + $(CORE_DIR)/libretro-common/include \ $(LOCAL_PATH)/$(TREMOR_SRC_DIR) \ $(LOCAL_PATH)/$(LIBRETRO_DIR) diff --git a/libretro/libretro.c b/libretro/libretro.c index a4f65f3..d39ee30 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -74,6 +74,7 @@ #include "libretro.h" #include "md_ntsc.h" #include "sms_ntsc.h" +#include sms_ntsc_t *sms_ntsc; md_ntsc_t *md_ntsc; @@ -169,7 +170,7 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten int size, left; /* Open file */ - FILE *fd = fopen(filename, "rb"); + RFILE *fd = filestream_open(filename, RFILE_MODE_READ, -1); if (!fd) { @@ -193,13 +194,13 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten } /* Get file size */ - fseek(fd, 0, SEEK_END); - size = ftell(fd); + filestream_seek(fd, 0, SEEK_END); + size = filestream_tell(fd); /* size limit */ if (size > MAXROMSIZE) { - fclose(fd); + filestream_close(fd); if (log_cb) log_cb(RETRO_LOG_ERROR, "File is too large.\n"); return 0; @@ -221,19 +222,19 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten /* Read into buffer */ left = size; - fseek(fd, 0, SEEK_SET); + filestream_seek(fd, 0, SEEK_SET); while (left > CHUNKSIZE) { - fread(buffer, CHUNKSIZE, 1, fd); + filestream_read(fd, buffer, CHUNKSIZE); buffer += CHUNKSIZE; left -= CHUNKSIZE; } /* Read remaining bytes */ - fread(buffer, left, 1, fd); + filestream_read(fd, buffer, left); /* Close file */ - fclose(fd); + filestream_close(fd); /* Return loaded ROM size */ return size; @@ -538,19 +539,19 @@ static void config_default(void) static void bram_load(void) { - FILE *fp; + RFILE *fp; /* automatically load internal backup RAM */ switch (region_code) { case REGION_JAPAN_NTSC: - fp = fopen(CD_BRAM_JP, "rb"); + fp = filestream_open(CD_BRAM_JP, RFILE_MODE_READ, -1); break; case REGION_EUROPE: - fp = fopen(CD_BRAM_EU, "rb"); + fp = filestream_open(CD_BRAM_EU, RFILE_MODE_READ, -1); break; case REGION_USA: - fp = fopen(CD_BRAM_US, "rb"); + fp = filestream_open(CD_BRAM_US, RFILE_MODE_READ, -1); break; default: return; @@ -558,8 +559,8 @@ static void bram_load(void) if (fp != NULL) { - fread(scd.bram, 0x2000, 1, fp); - fclose(fp); + filestream_read(fp, scd.bram, 0x2000); + filestream_close(fp); /* update CRC */ brm_crc[0] = crc32(0, scd.bram, 0x2000); @@ -590,7 +591,7 @@ static void bram_load(void) /* automatically load cartridge backup RAM (if enabled) */ if (scd.cartridge.id) { - fp = fopen(CART_BRAM, "rb"); + fp = filestream_open(CART_BRAM, RFILE_MODE_READ, -1); if (fp != NULL) { int filesize = scd.cartridge.mask + 1; @@ -599,7 +600,7 @@ static void bram_load(void) /* Read into buffer (2k blocks) */ while (filesize > CHUNKSIZE) { - fread(scd.cartridge.area + done, CHUNKSIZE, 1, fp); + filestream_read(fp, scd.cartridge.area + done, CHUNKSIZE); done += CHUNKSIZE; filesize -= CHUNKSIZE; } @@ -607,11 +608,11 @@ static void bram_load(void) /* Read remaining bytes */ if (filesize) { - fread(scd.cartridge.area + done, filesize, 1, fp); + filestream_read(fp, scd.cartridge.area + done, filesize); } /* close file */ - fclose(fp); + filestream_close(fp); /* update CRC */ brm_crc[1] = crc32(0, scd.cartridge.area, scd.cartridge.mask + 1); @@ -635,7 +636,7 @@ static void bram_load(void) static void bram_save(void) { - FILE *fp; + RFILE *fp; /* verify that internal backup RAM has been modified */ if (crc32(0, scd.bram, 0x2000) != brm_crc[0]) @@ -646,13 +647,13 @@ static void bram_save(void) switch (region_code) { case REGION_JAPAN_NTSC: - fp = fopen(CD_BRAM_JP, "wb"); + fp = filestream_open(CD_BRAM_JP, RFILE_MODE_WRITE, -1); break; case REGION_EUROPE: - fp = fopen(CD_BRAM_EU, "wb"); + fp = filestream_open(CD_BRAM_EU, RFILE_MODE_WRITE, -1); break; case REGION_USA: - fp = fopen(CD_BRAM_US, "wb"); + fp = filestream_open(CD_BRAM_US, RFILE_MODE_WRITE, -1); break; default: return; @@ -660,8 +661,8 @@ static void bram_save(void) if (fp != NULL) { - fwrite(scd.bram, 0x2000, 1, fp); - fclose(fp); + filestream_write(fp, scd.bram, 0x2000); + filestream_close(fp); /* update CRC */ brm_crc[0] = crc32(0, scd.bram, 0x2000); @@ -675,7 +676,7 @@ static void bram_save(void) /* check if it is correctly formatted before saving */ if (!memcmp(scd.cartridge.area + scd.cartridge.mask + 1 - 0x20, brm_format + 0x20, 0x20)) { - fp = fopen(CART_BRAM, "wb"); + fp = filestream_open(CART_BRAM, RFILE_MODE_WRITE, -1); if (fp != NULL) { int filesize = scd.cartridge.mask + 1; @@ -684,7 +685,7 @@ static void bram_save(void) /* Write to file (2k blocks) */ while (filesize > CHUNKSIZE) { - fwrite(scd.cartridge.area + done, CHUNKSIZE, 1, fp); + filestream_write(fp, scd.cartridge.area + done, CHUNKSIZE); done += CHUNKSIZE; filesize -= CHUNKSIZE; } @@ -692,11 +693,11 @@ static void bram_save(void) /* Write remaining bytes */ if (filesize) { - fwrite(scd.cartridge.area + done, filesize, 1, fp); + filestream_write(fp, scd.cartridge.area + done, filesize); } /* Close file */ - fclose(fp); + filestream_close(fp); /* update CRC */ brm_crc[1] = crc32(0, scd.cartridge.area, scd.cartridge.mask + 1); @@ -740,33 +741,25 @@ static void extract_directory(char *buf, const char *path, size_t size) static double calculate_display_aspect_ratio(void) { - if (config.aspect_ratio == 0) - { - if ((system_hw == SYSTEM_GG || system_hw == SYSTEM_GGMS) && config.overscan == 0 && config.gg_extra == 0) - { - return (6.0 / 5.0) * ((double)vwidth / (double)vheight); - } - } + double videosamplerate, dotrate; + bool is_h40 = false; + if (config.aspect_ratio == 0) + { + if ((system_hw == SYSTEM_GG || system_hw == SYSTEM_GGMS) && config.overscan == 0 && config.gg_extra == 0) + return (6.0 / 5.0) * ((double)vwidth / (double)vheight); + } - bool is_h40 = bitmap.viewport.w == 320; /* Could be read directly from the register as well. */ + is_h40 = bitmap.viewport.w == 320; /* Could be read directly from the register as well. */ + dotrate = system_clock / (is_h40 ? 8.0 : 10.0); - double dotrate = system_clock / (is_h40 ? 8.0 : 10.0); - double videosamplerate; + if (config.aspect_ratio == 1) /* Force NTSC PAR */ + videosamplerate = 135000000.0 / 11.0; + else if (config.aspect_ratio == 2) /* Force PAL PAR */ + videosamplerate = 14750000.0; + else + videosamplerate = vdp_pal ? 14750000.0 : 135000000.0 / 11.0; - if (config.aspect_ratio == 1) /* Force NTSC PAR */ - { - videosamplerate = 135000000.0 / 11.0; - } - else if (config.aspect_ratio == 2) /* Force PAL PAR */ - { - videosamplerate = 14750000.0; - } - else - { - videosamplerate = vdp_pal ? 14750000.0 : 135000000.0 / 11.0; - } - - return (videosamplerate / dotrate) * ((double)vwidth / ((double)vheight * 2.0)); + return (videosamplerate / dotrate) * ((double)vwidth / ((double)vheight * 2.0)); } static bool update_viewport(void) @@ -797,10 +790,10 @@ static bool update_viewport(void) static void check_variables(void) { unsigned orig_value; + struct retro_system_av_info info; bool update_viewports = false; bool reinit = false; struct retro_variable var = {0}; - struct retro_system_av_info info; var.key = "genesis_plus_gx_bram"; environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); @@ -2002,10 +1995,12 @@ bool retro_load_game(const struct retro_game_info *info) return false; #ifdef FRONTEND_SUPPORTS_RGB565 - unsigned rgb565 = RETRO_PIXEL_FORMAT_RGB565; - if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565)) - if (log_cb) - log_cb(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n"); + { + unsigned rgb565 = RETRO_PIXEL_FORMAT_RGB565; + if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565)) + if (log_cb) + log_cb(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n"); + } #endif sms_ntsc = calloc(1, sizeof(sms_ntsc_t)); diff --git a/libretro/msvc/msvc-2010.bat b/libretro/msvc/msvc-2010.bat deleted file mode 100644 index a4b0822..0000000 --- a/libretro/msvc/msvc-2010.bat +++ /dev/null @@ -1,124 +0,0 @@ -@echo off - -@echo Setting environment for using Microsoft Visual Studio 2010 x86 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%FrameworkDir32%"=="" goto error_no_FrameworkDIR32 -@if "%FrameworkVersion32%"=="" goto error_no_FrameworkVer32 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir32% -@set FrameworkVersion=%FrameworkVersion32% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib;%LIB%" -) - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR%Common7\IDE\ - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@if exist "%VCINSTALLDIR%VCPackages" set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%%FrameworkVersion%;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@if exist "%VCINSTALLDIR%BIN" set PATH=%VCINSTALLDIR%BIN;%PATH% -@set PATH=%DevEnvDir%;%PATH% - -@if exist "%VSINSTALLDIR%VSTSDB\Deploy" ( - @set "PATH=%VSINSTALLDIR%VSTSDB\Deploy;%PATH%" -) - -@if not "%FSHARPINSTALLDIR%" == "" ( - @set "PATH=%FSHARPINSTALLDIR%;%PATH%" -) - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@if exist "%VCINSTALLDIR%INCLUDE" set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIB=%VCINSTALLDIR%ATLMFC\LIB;%LIB% -@if exist "%VCINSTALLDIR%LIB" set LIB=%VCINSTALLDIR%LIB;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB;%LIBPATH% -@if exist "%VCINSTALLDIR%LIB" set LIBPATH=%VCINSTALLDIR%LIB;%LIBPATH% -@set LIBPATH=%FrameworkDir%%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%%FrameworkVersion%;%LIBPATH% - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_FrameworkDIR32 -@echo ERROR: Cannot determine the location of the .NET Framework 32bit installation. -@goto end - -:error_no_FrameworkVer32 -@echo ERROR: Cannot determine the version of the .NET Framework 32bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end - -msbuild msvc-2010.sln /p:Configuration=Release /target:clean -msbuild msvc-2010.sln /p:Configuration=Release -exit diff --git a/libretro/msvc/msvc-2010.sln b/libretro/msvc/msvc-2010.sln deleted file mode 100644 index c3c278d..0000000 --- a/libretro/msvc/msvc-2010.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2010", "msvc-2010/msvc-2010.vcxproj", "{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Debug|Win32.ActiveCfg = Debug|Win32 - {29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Debug|Win32.Build.0 = Debug|Win32 - {29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Release|Win32.ActiveCfg = Release|Win32 - {29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libretro/msvc/msvc-2010/libretro.def b/libretro/msvc/msvc-2010/libretro.def deleted file mode 100644 index 70f6699..0000000 --- a/libretro/msvc/msvc-2010/libretro.def +++ /dev/null @@ -1,27 +0,0 @@ -LIBRARY "msvc-2010" -EXPORTS -retro_set_environment -retro_set_video_refresh -retro_set_audio_sample -retro_set_audio_sample_batch -retro_set_input_poll -retro_set_input_state -retro_init -retro_deinit -retro_api_version -retro_get_system_info -retro_get_system_av_info -retro_set_controller_port_device -retro_reset -retro_run -retro_serialize_size -retro_serialize -retro_unserialize -retro_cheat_reset -retro_cheat_set -retro_load_game -retro_load_game_special -retro_unload_game -retro_get_region -retro_get_memory_data -retro_get_memory_size diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/libretro/msvc/msvc-2010/msvc-2010.vcxproj deleted file mode 100644 index f6972c0..0000000 --- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {29DF2EE7-2930-4BD3-8AC5-81A2534ACC99} - Win32Proj - msvc2010 - msvc-2010 - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - $(SolutionDir)msvc-2010\$(Configuration)\ - - - $(SolutionDir)msvc-2010\$(Configuration)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN - $(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories) - - - Windows - true - libretro.def - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN - $(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - libretro.def - - - - - - \ No newline at end of file diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters deleted file mode 100644 index 32ee69b..0000000 --- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters +++ /dev/null @@ -1,241 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {e0f9ca3b-df0f-4cf9-bde1-9fa3c945b0df} - - - {0605ef1a-d898-494c-a898-8f06000646ae} - - - {8b373848-96f7-4410-a466-5d7cb6866b0f} - - - {ea37a461-94f4-40e3-91a8-2b254b94f547} - - - {becebb08-7987-4fe3-8ee0-dd47889d4996} - - - {e66cf784-cb76-4a70-a2e0-327a3b4c96eb} - - - {39a1110f-2062-4e3c-9f43-aca63cc20cda} - - - {95e90e29-1915-4f70-b6e0-50b9dace48cf} - - - {eba4b43d-dbd8-4170-9853-e3234db6dfc0} - - - {c4a5e1da-1ff3-4c81-893c-97364ed7ed4b} - - - - - Source Files\cart_hw\svp - - - Source Files\cart_hw\svp - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\input_hw - - - Source Files\libretro - - - Source Files\m68k - - - Source Files\m68k - - - Source Files\ntsc - - - Source Files\ntsc - - - Source Files\sound - - - Source Files\sound - - - Source Files\sound - - - Source Files\sound - - - Source Files\sound - - - Source Files\z80 - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\cd_hw - - - Source Files\cd_hw - - - Source Files\cd_hw - - - Source Files\cd_hw - - - Source Files\cd_hw - - - Source Files\cd_hw - - - Source Files\libretro - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\cart_hw - - - Source Files\sound - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - Source Files\tremor - - - \ No newline at end of file