mirror of
https://github.com/ekeeke/Genesis-Plus-GX.git
synced 2024-12-27 19:51:48 +01:00
revert changes and reapply commits since then
This commit is contained in:
parent
365a28c734
commit
ec55328448
@ -27,7 +27,7 @@ endif
|
|||||||
|
|
||||||
TARGET_NAME := genesis_plus_gx
|
TARGET_NAME := genesis_plus_gx
|
||||||
|
|
||||||
LIBM := -lm
|
LIBS := -lm
|
||||||
|
|
||||||
GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
|
GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
|
||||||
ifneq ($(GIT_VERSION)," unknown")
|
ifneq ($(GIT_VERSION)," unknown")
|
||||||
@ -62,7 +62,7 @@ else ifeq ($(platform), linux-portable)
|
|||||||
SHARED := -shared -Wl,--version-script=libretro/link.T
|
SHARED := -shared -Wl,--version-script=libretro/link.T
|
||||||
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
|
ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
|
||||||
PLATFORM_DEFINES := -DHAVE_ZLIB
|
PLATFORM_DEFINES := -DHAVE_ZLIB
|
||||||
LIBM :=
|
LIBS =
|
||||||
|
|
||||||
# OS X
|
# OS X
|
||||||
else ifeq ($(platform), osx)
|
else ifeq ($(platform), osx)
|
||||||
@ -235,7 +235,54 @@ else ifeq ($(platform), gcw0)
|
|||||||
LDFLAGS += $(PTHREAD_FLAGS)
|
LDFLAGS += $(PTHREAD_FLAGS)
|
||||||
CFLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR
|
CFLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR
|
||||||
CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
|
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
|
# Windows
|
||||||
else
|
else
|
||||||
TARGET := $(TARGET_NAME)_libretro.dll
|
TARGET := $(TARGET_NAME)_libretro.dll
|
||||||
@ -247,19 +294,15 @@ else
|
|||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LDFLAGS += $(LIBM)
|
LDFLAGS += $(LIBS)
|
||||||
ifeq ($(SHARED_LIBVORBIS), 1)
|
ifeq ($(SHARED_LIBVORBIS), 1)
|
||||||
LDFLAGS += -lvorbisfile
|
LDFLAGS += -lvorbisfile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(DEBUG), 1)
|
ifeq ($(DEBUG), 1)
|
||||||
CFLAGS += -O0 -g
|
CFLAGS += -O0 -g
|
||||||
else ifeq ($(platform),qnx)
|
|
||||||
CFLAGS += -Os -DNDEBUG
|
|
||||||
else ifeq ($(platform), emscripten)
|
|
||||||
CFLAGS += -O2 -DNDEBUG
|
|
||||||
else
|
else
|
||||||
CFLAGS += -O3 -DNDEBUG
|
CFLAGS += -O2 -DNDEBUG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CORE_DIR := .
|
CORE_DIR := .
|
||||||
@ -292,18 +335,29 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
LIBRETRO_CFLAGS += $(INCFLAGS)
|
LIBRETRO_CFLAGS += $(INCFLAGS) $(INCFLAGS_PLATFORM)
|
||||||
LIBRETRO_CFLAGS += $(BPP_DEFINES) \
|
LIBRETRO_CFLAGS += $(BPP_DEFINES) \
|
||||||
$(ENDIANNESS_DEFINES) \
|
$(ENDIANNESS_DEFINES) \
|
||||||
$(PLATFORM_DEFINES) \
|
$(PLATFORM_DEFINES) \
|
||||||
-D__LIBRETRO__
|
-D__LIBRETRO__
|
||||||
|
|
||||||
ifeq ($(platform), qnx)
|
ifneq (,$(findstring msvc,$(platform)))
|
||||||
LIBRETRO_CFLAGS += -D__inline__=inline
|
LIBRETRO_CFLAGS += -DINLINE="static _inline"
|
||||||
else
|
else
|
||||||
LIBRETRO_CFLAGS += -DINLINE="static inline"
|
LIBRETRO_CFLAGS += -DINLINE="static inline"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
OBJOUT = -o
|
||||||
|
LINKOUT = -o
|
||||||
|
|
||||||
|
ifneq (,$(findstring msvc,$(platform)))
|
||||||
|
OBJOUT = -Fo
|
||||||
|
LINKOUT = -out:
|
||||||
|
LD = link.exe
|
||||||
|
else
|
||||||
|
LD = $(CC)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(platform), theos_ios)
|
ifeq ($(platform), theos_ios)
|
||||||
COMMON_FLAGS := $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
|
COMMON_FLAGS := $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
|
||||||
$(LIBRARY_NAME)_CFLAGS += $(CFLAGS) $(LIBRETRO_CFLAGS) $(COMMON_FLAGS)
|
$(LIBRARY_NAME)_CFLAGS += $(CFLAGS) $(LIBRETRO_CFLAGS) $(COMMON_FLAGS)
|
||||||
@ -314,13 +368,13 @@ else
|
|||||||
all: $(TARGET)
|
all: $(TARGET)
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) $(LIBRETRO_CFLAGS)
|
$(CC) $(OBJOUT)$@ -c $< $(CPPFLAGS) $(CFLAGS) $(LIBRETRO_CFLAGS)
|
||||||
|
|
||||||
$(TARGET): $(OBJECTS)
|
$(TARGET): $(OBJECTS)
|
||||||
ifeq ($(STATIC_LINKING), 1)
|
ifeq ($(STATIC_LINKING), 1)
|
||||||
$(AR) rcs $@ $(OBJECTS)
|
$(AR) rcs $@ $(OBJECTS)
|
||||||
else
|
else
|
||||||
$(CC) -o $(TARGET) $(fpic) $(OBJECTS) $(LDFLAGS) $(SHARED)
|
$(LD) $(LINKOUT)$(TARGET) $(fpic) $(OBJECTS) $(LDFLAGS) $(SHARED) $(LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
clean-objs:
|
clean-objs:
|
||||||
|
@ -10,6 +10,10 @@ GENPLUS_SRC_DIR := $(CORE_DIR)/core \
|
|||||||
|
|
||||||
SOURCES_C = $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c))
|
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),)
|
ifeq ($(SHARED_LIBVORBIS),)
|
||||||
SOURCES_C += $(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c))
|
SOURCES_C += $(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c))
|
||||||
endif
|
endif
|
||||||
@ -18,4 +22,4 @@ SOURCES_C += $(LIBRETRO_DIR)/libretro.c
|
|||||||
|
|
||||||
SOURCES_C += $(LIBRETRO_DIR)/scrc32.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
|
||||||
|
@ -26,6 +26,7 @@ include $(LIBRETRO_DIR)/Makefile.common
|
|||||||
LOCAL_SRC_FILES := $(SOURCES_C)
|
LOCAL_SRC_FILES := $(SOURCES_C)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
|
LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
|
||||||
|
$(CORE_DIR)/libretro-common/include \
|
||||||
$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
|
$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
|
||||||
$(LOCAL_PATH)/$(LIBRETRO_DIR)
|
$(LOCAL_PATH)/$(LIBRETRO_DIR)
|
||||||
|
|
||||||
|
@ -74,6 +74,7 @@
|
|||||||
#include "libretro.h"
|
#include "libretro.h"
|
||||||
#include "md_ntsc.h"
|
#include "md_ntsc.h"
|
||||||
#include "sms_ntsc.h"
|
#include "sms_ntsc.h"
|
||||||
|
#include <streams/file_stream.h>
|
||||||
|
|
||||||
sms_ntsc_t *sms_ntsc;
|
sms_ntsc_t *sms_ntsc;
|
||||||
md_ntsc_t *md_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;
|
int size, left;
|
||||||
|
|
||||||
/* Open file */
|
/* Open file */
|
||||||
FILE *fd = fopen(filename, "rb");
|
RFILE *fd = filestream_open(filename, RFILE_MODE_READ, -1);
|
||||||
|
|
||||||
if (!fd)
|
if (!fd)
|
||||||
{
|
{
|
||||||
@ -193,13 +194,13 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Get file size */
|
/* Get file size */
|
||||||
fseek(fd, 0, SEEK_END);
|
filestream_seek(fd, 0, SEEK_END);
|
||||||
size = ftell(fd);
|
size = filestream_tell(fd);
|
||||||
|
|
||||||
/* size limit */
|
/* size limit */
|
||||||
if (size > MAXROMSIZE)
|
if (size > MAXROMSIZE)
|
||||||
{
|
{
|
||||||
fclose(fd);
|
filestream_close(fd);
|
||||||
if (log_cb)
|
if (log_cb)
|
||||||
log_cb(RETRO_LOG_ERROR, "File is too large.\n");
|
log_cb(RETRO_LOG_ERROR, "File is too large.\n");
|
||||||
return 0;
|
return 0;
|
||||||
@ -221,19 +222,19 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten
|
|||||||
|
|
||||||
/* Read into buffer */
|
/* Read into buffer */
|
||||||
left = size;
|
left = size;
|
||||||
fseek(fd, 0, SEEK_SET);
|
filestream_seek(fd, 0, SEEK_SET);
|
||||||
while (left > CHUNKSIZE)
|
while (left > CHUNKSIZE)
|
||||||
{
|
{
|
||||||
fread(buffer, CHUNKSIZE, 1, fd);
|
filestream_read(fd, buffer, CHUNKSIZE);
|
||||||
buffer += CHUNKSIZE;
|
buffer += CHUNKSIZE;
|
||||||
left -= CHUNKSIZE;
|
left -= CHUNKSIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read remaining bytes */
|
/* Read remaining bytes */
|
||||||
fread(buffer, left, 1, fd);
|
filestream_read(fd, buffer, left);
|
||||||
|
|
||||||
/* Close file */
|
/* Close file */
|
||||||
fclose(fd);
|
filestream_close(fd);
|
||||||
|
|
||||||
/* Return loaded ROM size */
|
/* Return loaded ROM size */
|
||||||
return size;
|
return size;
|
||||||
@ -538,19 +539,19 @@ static void config_default(void)
|
|||||||
|
|
||||||
static void bram_load(void)
|
static void bram_load(void)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
RFILE *fp;
|
||||||
|
|
||||||
/* automatically load internal backup RAM */
|
/* automatically load internal backup RAM */
|
||||||
switch (region_code)
|
switch (region_code)
|
||||||
{
|
{
|
||||||
case REGION_JAPAN_NTSC:
|
case REGION_JAPAN_NTSC:
|
||||||
fp = fopen(CD_BRAM_JP, "rb");
|
fp = filestream_open(CD_BRAM_JP, RFILE_MODE_READ, -1);
|
||||||
break;
|
break;
|
||||||
case REGION_EUROPE:
|
case REGION_EUROPE:
|
||||||
fp = fopen(CD_BRAM_EU, "rb");
|
fp = filestream_open(CD_BRAM_EU, RFILE_MODE_READ, -1);
|
||||||
break;
|
break;
|
||||||
case REGION_USA:
|
case REGION_USA:
|
||||||
fp = fopen(CD_BRAM_US, "rb");
|
fp = filestream_open(CD_BRAM_US, RFILE_MODE_READ, -1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
@ -558,8 +559,8 @@ static void bram_load(void)
|
|||||||
|
|
||||||
if (fp != NULL)
|
if (fp != NULL)
|
||||||
{
|
{
|
||||||
fread(scd.bram, 0x2000, 1, fp);
|
filestream_read(fp, scd.bram, 0x2000);
|
||||||
fclose(fp);
|
filestream_close(fp);
|
||||||
|
|
||||||
/* update CRC */
|
/* update CRC */
|
||||||
brm_crc[0] = crc32(0, scd.bram, 0x2000);
|
brm_crc[0] = crc32(0, scd.bram, 0x2000);
|
||||||
@ -590,7 +591,7 @@ static void bram_load(void)
|
|||||||
/* automatically load cartridge backup RAM (if enabled) */
|
/* automatically load cartridge backup RAM (if enabled) */
|
||||||
if (scd.cartridge.id)
|
if (scd.cartridge.id)
|
||||||
{
|
{
|
||||||
fp = fopen(CART_BRAM, "rb");
|
fp = filestream_open(CART_BRAM, RFILE_MODE_READ, -1);
|
||||||
if (fp != NULL)
|
if (fp != NULL)
|
||||||
{
|
{
|
||||||
int filesize = scd.cartridge.mask + 1;
|
int filesize = scd.cartridge.mask + 1;
|
||||||
@ -599,7 +600,7 @@ static void bram_load(void)
|
|||||||
/* Read into buffer (2k blocks) */
|
/* Read into buffer (2k blocks) */
|
||||||
while (filesize > CHUNKSIZE)
|
while (filesize > CHUNKSIZE)
|
||||||
{
|
{
|
||||||
fread(scd.cartridge.area + done, CHUNKSIZE, 1, fp);
|
filestream_read(fp, scd.cartridge.area + done, CHUNKSIZE);
|
||||||
done += CHUNKSIZE;
|
done += CHUNKSIZE;
|
||||||
filesize -= CHUNKSIZE;
|
filesize -= CHUNKSIZE;
|
||||||
}
|
}
|
||||||
@ -607,11 +608,11 @@ static void bram_load(void)
|
|||||||
/* Read remaining bytes */
|
/* Read remaining bytes */
|
||||||
if (filesize)
|
if (filesize)
|
||||||
{
|
{
|
||||||
fread(scd.cartridge.area + done, filesize, 1, fp);
|
filestream_read(fp, scd.cartridge.area + done, filesize);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* close file */
|
/* close file */
|
||||||
fclose(fp);
|
filestream_close(fp);
|
||||||
|
|
||||||
/* update CRC */
|
/* update CRC */
|
||||||
brm_crc[1] = crc32(0, scd.cartridge.area, scd.cartridge.mask + 1);
|
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)
|
static void bram_save(void)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
RFILE *fp;
|
||||||
|
|
||||||
/* verify that internal backup RAM has been modified */
|
/* verify that internal backup RAM has been modified */
|
||||||
if (crc32(0, scd.bram, 0x2000) != brm_crc[0])
|
if (crc32(0, scd.bram, 0x2000) != brm_crc[0])
|
||||||
@ -646,13 +647,13 @@ static void bram_save(void)
|
|||||||
switch (region_code)
|
switch (region_code)
|
||||||
{
|
{
|
||||||
case REGION_JAPAN_NTSC:
|
case REGION_JAPAN_NTSC:
|
||||||
fp = fopen(CD_BRAM_JP, "wb");
|
fp = filestream_open(CD_BRAM_JP, RFILE_MODE_WRITE, -1);
|
||||||
break;
|
break;
|
||||||
case REGION_EUROPE:
|
case REGION_EUROPE:
|
||||||
fp = fopen(CD_BRAM_EU, "wb");
|
fp = filestream_open(CD_BRAM_EU, RFILE_MODE_WRITE, -1);
|
||||||
break;
|
break;
|
||||||
case REGION_USA:
|
case REGION_USA:
|
||||||
fp = fopen(CD_BRAM_US, "wb");
|
fp = filestream_open(CD_BRAM_US, RFILE_MODE_WRITE, -1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
@ -660,8 +661,8 @@ static void bram_save(void)
|
|||||||
|
|
||||||
if (fp != NULL)
|
if (fp != NULL)
|
||||||
{
|
{
|
||||||
fwrite(scd.bram, 0x2000, 1, fp);
|
filestream_write(fp, scd.bram, 0x2000);
|
||||||
fclose(fp);
|
filestream_close(fp);
|
||||||
|
|
||||||
/* update CRC */
|
/* update CRC */
|
||||||
brm_crc[0] = crc32(0, scd.bram, 0x2000);
|
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 */
|
/* check if it is correctly formatted before saving */
|
||||||
if (!memcmp(scd.cartridge.area + scd.cartridge.mask + 1 - 0x20, brm_format + 0x20, 0x20))
|
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)
|
if (fp != NULL)
|
||||||
{
|
{
|
||||||
int filesize = scd.cartridge.mask + 1;
|
int filesize = scd.cartridge.mask + 1;
|
||||||
@ -684,7 +685,7 @@ static void bram_save(void)
|
|||||||
/* Write to file (2k blocks) */
|
/* Write to file (2k blocks) */
|
||||||
while (filesize > CHUNKSIZE)
|
while (filesize > CHUNKSIZE)
|
||||||
{
|
{
|
||||||
fwrite(scd.cartridge.area + done, CHUNKSIZE, 1, fp);
|
filestream_write(fp, scd.cartridge.area + done, CHUNKSIZE);
|
||||||
done += CHUNKSIZE;
|
done += CHUNKSIZE;
|
||||||
filesize -= CHUNKSIZE;
|
filesize -= CHUNKSIZE;
|
||||||
}
|
}
|
||||||
@ -692,11 +693,11 @@ static void bram_save(void)
|
|||||||
/* Write remaining bytes */
|
/* Write remaining bytes */
|
||||||
if (filesize)
|
if (filesize)
|
||||||
{
|
{
|
||||||
fwrite(scd.cartridge.area + done, filesize, 1, fp);
|
filestream_write(fp, scd.cartridge.area + done, filesize);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Close file */
|
/* Close file */
|
||||||
fclose(fp);
|
filestream_close(fp);
|
||||||
|
|
||||||
/* update CRC */
|
/* update CRC */
|
||||||
brm_crc[1] = crc32(0, scd.cartridge.area, scd.cartridge.mask + 1);
|
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)
|
static double calculate_display_aspect_ratio(void)
|
||||||
{
|
{
|
||||||
if (config.aspect_ratio == 0)
|
double videosamplerate, dotrate;
|
||||||
{
|
bool is_h40 = false;
|
||||||
if ((system_hw == SYSTEM_GG || system_hw == SYSTEM_GGMS) && config.overscan == 0 && config.gg_extra == 0)
|
if (config.aspect_ratio == 0)
|
||||||
{
|
{
|
||||||
return (6.0 / 5.0) * ((double)vwidth / (double)vheight);
|
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);
|
if (config.aspect_ratio == 1) /* Force NTSC PAR */
|
||||||
double videosamplerate;
|
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 */
|
return (videosamplerate / dotrate) * ((double)vwidth / ((double)vheight * 2.0));
|
||||||
{
|
|
||||||
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));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool update_viewport(void)
|
static bool update_viewport(void)
|
||||||
@ -797,10 +790,10 @@ static bool update_viewport(void)
|
|||||||
static void check_variables(void)
|
static void check_variables(void)
|
||||||
{
|
{
|
||||||
unsigned orig_value;
|
unsigned orig_value;
|
||||||
|
struct retro_system_av_info info;
|
||||||
bool update_viewports = false;
|
bool update_viewports = false;
|
||||||
bool reinit = false;
|
bool reinit = false;
|
||||||
struct retro_variable var = {0};
|
struct retro_variable var = {0};
|
||||||
struct retro_system_av_info info;
|
|
||||||
|
|
||||||
var.key = "genesis_plus_gx_bram";
|
var.key = "genesis_plus_gx_bram";
|
||||||
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
|
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
|
||||||
@ -2002,10 +1995,12 @@ bool retro_load_game(const struct retro_game_info *info)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
#ifdef FRONTEND_SUPPORTS_RGB565
|
#ifdef FRONTEND_SUPPORTS_RGB565
|
||||||
unsigned rgb565 = RETRO_PIXEL_FORMAT_RGB565;
|
{
|
||||||
if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
|
unsigned rgb565 = RETRO_PIXEL_FORMAT_RGB565;
|
||||||
if (log_cb)
|
if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
|
||||||
log_cb(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n");
|
if (log_cb)
|
||||||
|
log_cb(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n");
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sms_ntsc = calloc(1, sizeof(sms_ntsc_t));
|
sms_ntsc = calloc(1, sizeof(sms_ntsc_t));
|
||||||
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -1,150 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\areplay.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\ggenie.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\md_cart.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\sms_cart.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\sram.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\svp\svp.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cdc.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cdd.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cd_cart.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\gfx.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\pcm.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\scd.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\genesis.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\activator.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\gamepad.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\input.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\lightgun.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\mouse.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\paddle.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\sportspad.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\teamplayer.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\xe_a1p.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\io_ctrl.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\loadrom.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\m68k\m68kcpu.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\m68k\s68kcpu.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\mem68k.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\membnk.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\memz80.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\ntsc\md_ntsc.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\blip_buf.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\eq.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\psg.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\sound.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\ym2413.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\sound\ym2612.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\state.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\system.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\bitwise.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\block.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\codebook.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\floor0.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\floor1.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\framing.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\info.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\mapping0.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\mdct.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\registry.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\res012.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\sharedbook.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\synthesis.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\vorbisfile.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\window.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\vdp_ctrl.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\vdp_render.c" />
|
|
||||||
<ClCompile Include="..\..\..\core\z80\z80.c" />
|
|
||||||
<ClCompile Include="..\..\libretro.c" />
|
|
||||||
<ClCompile Include="..\..\scrc32.c" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>msvc2010</RootNamespace>
|
|
||||||
<ProjectName>msvc-2010</ProjectName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<OutDir>$(SolutionDir)msvc-2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<OutDir>$(SolutionDir)msvc-2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>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</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>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</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
@ -1,241 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Source Files">
|
|
||||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
|
||||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Header Files">
|
|
||||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
|
||||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\z80">
|
|
||||||
<UniqueIdentifier>{e0f9ca3b-df0f-4cf9-bde1-9fa3c945b0df}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\m68k">
|
|
||||||
<UniqueIdentifier>{0605ef1a-d898-494c-a898-8f06000646ae}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\cart_hw">
|
|
||||||
<UniqueIdentifier>{8b373848-96f7-4410-a466-5d7cb6866b0f}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\cart_hw\svp">
|
|
||||||
<UniqueIdentifier>{ea37a461-94f4-40e3-91a8-2b254b94f547}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\input_hw">
|
|
||||||
<UniqueIdentifier>{becebb08-7987-4fe3-8ee0-dd47889d4996}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\ntsc">
|
|
||||||
<UniqueIdentifier>{e66cf784-cb76-4a70-a2e0-327a3b4c96eb}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\sound">
|
|
||||||
<UniqueIdentifier>{39a1110f-2062-4e3c-9f43-aca63cc20cda}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\libretro">
|
|
||||||
<UniqueIdentifier>{95e90e29-1915-4f70-b6e0-50b9dace48cf}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\cd_hw">
|
|
||||||
<UniqueIdentifier>{eba4b43d-dbd8-4170-9853-e3234db6dfc0}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Source Files\tremor">
|
|
||||||
<UniqueIdentifier>{c4a5e1da-1ff3-4c81-893c-97364ed7ed4b}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\svp\svp.c">
|
|
||||||
<Filter>Source Files\cart_hw\svp</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c">
|
|
||||||
<Filter>Source Files\cart_hw\svp</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\sram.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\areplay.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\ggenie.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\md_cart.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\sms_cart.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\xe_a1p.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\activator.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\gamepad.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\input.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\lightgun.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\mouse.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\paddle.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\sportspad.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\teamplayer.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c">
|
|
||||||
<Filter>Source Files\input_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\libretro.c">
|
|
||||||
<Filter>Source Files\libretro</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\m68k\s68kcpu.c">
|
|
||||||
<Filter>Source Files\m68k</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\m68k\m68kcpu.c">
|
|
||||||
<Filter>Source Files\m68k</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c">
|
|
||||||
<Filter>Source Files\ntsc</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\ntsc\md_ntsc.c">
|
|
||||||
<Filter>Source Files\ntsc</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\ym2612.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\eq.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\psg.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\sound.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\ym2413.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\z80\z80.c">
|
|
||||||
<Filter>Source Files\z80</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\vdp_render.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\genesis.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\io_ctrl.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\loadrom.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\mem68k.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\membnk.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\memz80.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\state.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\system.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\vdp_ctrl.c">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\scd.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cd_cart.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cdc.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\cdd.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\gfx.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cd_hw\pcm.c">
|
|
||||||
<Filter>Source Files\cd_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\scrc32.c">
|
|
||||||
<Filter>Source Files\libretro</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
|
|
||||||
<Filter>Source Files\cart_hw</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\sound\blip_buf.c">
|
|
||||||
<Filter>Source Files\sound</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\window.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\bitwise.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\block.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\codebook.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\floor0.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\floor1.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\framing.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\info.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\mapping0.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\mdct.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\registry.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\res012.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\sharedbook.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\synthesis.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\core\tremor\vorbisfile.c">
|
|
||||||
<Filter>Source Files\tremor</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
Loading…
Reference in New Issue
Block a user