Update libretro port

2014-03-30 22:35:00 +02:00
parent 30b4c60b21
commit 73bf72aa6c
20 changed files with 5762 additions and 3654 deletions
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,4 +1,6 @@
 DEBUG = 0
+EXTERNAL_ZLIB = 0
+WANT_GRIFFIN = 0

 ifeq ($(platform),)
 platform = unix
@@ -24,53 +26,111 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

+TARGET_NAME := fceumm
+
 ifeq ($(platform), unix)
-   TARGET := libretro.so
+   TARGET := $(TARGET_NAME)_libretro.so
   fpic := -fPIC
   SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
   ZLIB_DIR := ./src/zlib
 else ifeq ($(platform), osx)
-   TARGET := libretro.dylib
-   fpic := -fPIC
+   TARGET := $(TARGET_NAME)_libretro.dylib
+   fpic := -fPIC -mmacosx-version-min=10.6
   SHARED := -dynamiclib
   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
   CFLAGS += -DHAVE_ASPRINTF
+   ZLIB_DIR := ./src/zlib
+else ifeq ($(platform), qnx)
+   TARGET := $(TARGET_NAME)_libretro_qnx.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
+   ZLIB_DIR := ./src/zlib
+
+	CC = qcc -Vgcc_ntoarmv7le
+	AR = qcc -Vgcc_ntoarmv7le
+	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+else ifeq ($(platform), ios)
+   TARGET := $(TARGET_NAME)_libretro_ios.dylib
+   fpic := -fPIC
+   SHARED := -dynamiclib
+   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
+   CFLAGS += -DHAVE_ASPRINTF -DIOS
+   ZLIB_DIR := ./src/zlib
+   CC = clang -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0
+   CFLAGS += -DIOS -miphoneos-version-min=5.0
 else ifeq ($(platform), ps3)
-   TARGET := libretro_ps3.a
+   TARGET := $(TARGET_NAME)_libretro_ps3.a
   CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
   AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
   PLATFORM_DEFINES := -D__CELLOS_LV2
+	STATIC_LINKING = 1
 else ifeq ($(platform), sncps3)
-   TARGET := libretro_ps3.a
+   TARGET := $(TARGET_NAME)_libretro_ps3.a
   CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
   AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
   PLATFORM_DEFINES := -D__CELLOS_LV2
+	STATIC_LINKING = 1
+else ifeq ($(platform), psp1)
+   TARGET := $(TARGET_NAME)_libretro_psp1.a
+	CC = psp-gcc$(EXE_EXT)
+	CXX = psp-g++$(EXE_EXT)
+	AR = psp-ar$(EXE_EXT)
+   PLATFORM_DEFINES := -DPSP -G0 -DLSB_FIRST -DHAVE_ASPRINTF
+	STATIC_LINKING = 1
 else ifeq ($(platform), psl1ght)
-   TARGET := libretro_psl1ght.a
+   TARGET := $(TARGET_NAME)_libretro_psl1ght.a
   CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
   AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
   PLATFORM_DEFINES := -D__CELLOS_LV2 -DHAVE_ASPRINTF
+	STATIC_LINKING = 1
 else ifeq ($(platform), xenon)
-   TARGET := libretro_xenon360.a
+   TARGET := $(TARGET_NAME)_libretro_xenon360.a
   CC = xenon-gcc$(EXE_EXT)
   AR = xenon-ar$(EXE_EXT)
   PLATFORM_DEFINES := -D__LIBXENON__
   CFLAGS += -DHAVE_ASPRINTF
+	STATIC_LINKING = 1
 else ifeq ($(platform), ngc)
-   TARGET := libretro_ngc.a
+   TARGET := $(TARGET_NAME)_libretro_ngc.a
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
   PLATFORM_DEFINES := -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float
   CFLAGS += -DHAVE_ASPRINTF
+	STATIC_LINKING = 1
 else ifeq ($(platform), wii)
-   TARGET := libretro_wii.a
+   TARGET := $(TARGET_NAME)_libretro_wii.a
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
   PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
   CFLAGS += -DHAVE_ASPRINTF
+	STATIC_LINKING = 1
+else ifneq (,$(findstring armv,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro.so
+   SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
+   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
+   fpic := -fPIC
+   CC = gcc
+   ZLIB_DIR := ./src/zlib
+ifneq (,$(findstring cortexa8,$(platform)))
+   PLATFORM_DEFINES += -marm -mcpu=cortex-a8
+else ifneq (,$(findstring cortexa9,$(platform)))
+   PLATFORM_DEFINES += -marm -mcpu=cortex-a9
+endif
+   PLATFORM_DEFINES += -marm
+ifneq (,$(findstring neon,$(platform)))
+   PLATFORM_DEFINES += -mfpu=neon
+   HAVE_NEON = 1
+endif
+ifneq (,$(findstring softfloat,$(platform)))
+   PLATFORM_DEFINES += -mfloat-abi=softfp
+else ifneq (,$(findstring hardfloat,$(platform)))
+   PLATFORM_DEFINES += -mfloat-abi=hard
+endif
+   PLATFORM_DEFINES += -DARM
 else
-   TARGET := retro.dll
+   TARGET := $(TARGET_NAME)_libretro.dll
   CC = gcc
   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
   ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
@@ -83,23 +143,34 @@ else
 	CFLAGS += -O3 -DNDEBUG
 endif

+ifeq ($(EXTERNAL_ZLIB), 1)
+	ZLIB_DIR := 
+	CFLAGS += -DHAVE_EXTERNAL_ZLIB
+	LDFLAGS += -lz
+endif
+
 LIBRETRO_DIR := ./src/drivers/libretro
 FCEU_DIR := ./src

-FCEU_SRC_DIRS := $(LIBRETRO_DIR) $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR)
+ifeq ($(WANT_GRIFFIN), 1)
+	CFLAGS += -DWANT_GRIFFIN
+	FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR)
+	FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
+	FCEU_CSRCS += $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c
+else
+	FCEU_SRC_DIRS := $(LIBRETRO_DIR) $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR)
+	FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
+endif

-FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
 FCEU_COBJ := $(FCEU_CSRCS:.c=.o)

 OBJS := $(FCEU_COBJ)

-FCEU_DEFINES := -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 $(PLATFORM_DEFINES)
+FCEU_DEFINES := -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DINLINE=inline -DPSS_STYLE=1 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 $(PLATFORM_DEFINES)

 ifeq ($(platform), sncps3)
-CODE_DEFINES =
 WARNING_DEFINES =
 else
-CODE_DEFINES = -std=gnu99
 WARNING_DEFINES = -Wno-write-strings
 endif

@@ -109,18 +180,18 @@ LDFLAGS += -lm
 INCDIRS := -I$(LIBRETRO_DIR) -I$(FCEU_DIR) -I$(FCEU_DIR)/input -I$(FCEU_DIR)/boards -I$(FCEU_DIR)/mappers
 LIBS :=

+ifeq ($(platform), psp1)
+	INCDIRS += -I$(shell psp-config --pspsdk-path)/include
+endif
+
+ifeq ($(EXTERNAL_ZLIB), 0)
+	INCDIRS += -I$(FCEU_DIR)/zlib
+endif
+
+all: $(TARGET)
+
 $(TARGET): $(OBJS)
-ifeq ($(platform), ps3)
-	$(AR) rcs $@ $(OBJS)
-else ifeq ($(platform), sncps3)
-	$(AR) rcs $@ $(OBJS)
-else ifeq ($(platform), psl1ght)
-	$(AR) rcs $@ $(OBJS)
-else ifeq ($(platform), xenon)
-	$(AR) rcs $@ $(OBJS)
-else ifeq ($(platform), ngc)
-	$(AR) rcs $@ $(OBJS)
-else ifeq ($(platform), wii)
+ifeq ($(STATIC_LINKING), 1)
 	$(AR) rcs $@ $(OBJS)
 else
 	$(CC) -o $@ $(SHARED) $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS)
--- a/src/drivers/libretro/crc32-zlib.c
+++ b/src/drivers/libretro/crc32-zlib.c
@@ -0,0 +1,92 @@
+#ifndef _S_CRC32_H
+#define _S_CRC32_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HAVE_EXTERNAL_ZLIB
+
+static const unsigned long crc_table[256] = {
+  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+  0x2d02ef8dL
+};
+
+#define DO1_CRC32(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2_CRC32(buf) DO1_CRC32(buf); DO1_CRC32(buf);
+#define DO4_CRC32(buf) DO2_CRC32(buf); DO2_CRC32(buf);
+#define DO8_CRC32(buf) DO4_CRC32(buf); DO4_CRC32(buf);
+
+unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len)
+{
+	if (buf == 0) return 0L;
+	crc = crc ^ 0xffffffffL;
+	while (len >= 8)
+	{
+	DO8_CRC32(buf);
+	len -= 8;
+	}
+	if (len) do {
+	DO1_CRC32(buf);
+	} while (--len);
+	return crc ^ 0xffffffffL;
+}
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -0,0 +1,35 @@
+#ifdef WANT_GRIFFIN
+
+#include "drivers/libretro/libretro.c"
+#include "drivers/libretro/memstream.c"
+
+#include "cart.c"
+#include "crc32.c"
+#include "fceu.c"
+#include "fceustr.c"
+#include "file.c"
+#include "general.c"
+#include "md5.c"
+#include "movie.c"
+#include "nsf.c"
+#include "ppu.c"
+#include "vsuni.c"
+#include "x6502.c"
+#include "cheat.c"
+#include "debug.c"
+#include "fceu-endian.c"
+#include "fds.c"
+#include "filter.c"
+#include "input.c"
+#include "memory.c"
+#include "netplay.c"
+#include "palette.c"
+#include "state.c"
+#include "video.c"
+#include "wave.c"
+#include "sound.c"
+
+//#include "ines.c"
+//#include "unif.c"
+
+#endif
--- a/src/drivers/libretro/jni/Android.mk
+++ b/src/drivers/libretro/jni/Android.mk
@@ -2,20 +2,30 @@ LOCAL_PATH := $(call my-dir)

 include $(CLEAR_VARS)

-LOCAL_MODULE    := libretro
-FCEU_SRC_DIRS := ../../../../src ../../../../src/boards ../../../../src/input ../../../../src/mappers
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -DANDROID_ARM
+LOCAL_ARM_MODE := arm
+endif

-FCEU_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../../../src/*.c) \
-		$(wildcard $(LOCAL_PATH)/../../../../src/boards/*.c) \
-		$(wildcard $(LOCAL_PATH)/../../../../src/input/*.c) \
-		$(wildcard $(LOCAL_PATH)/../../../../src/mappers/*.c)
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS +=  -DANDROID_X86
+endif

-FCEU_SRC_FILES := $(FCEU_SRC_FILES:$(LOCAL_PATH)/%=%)
+ifeq ($(TARGET_ARCH),mips)
+LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+endif

-LOCAL_SRC_FILES  = ../libretro/libretro.c \
-		../libretro/memstream.c \
-		$(FCEU_SRC_FILES)
+FCEU_DIR := ../../..
+LIBRETRO_DIR := ..

-LOCAL_CFLAGS = -DINLINE=inline -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DPSS_STYLE=1 -DLSB_FIRST -D__LIBRETRO__ -DHAVE_ASPRINTF
+LOCAL_MODULE    := retro
+FCEU_SRC_DIRS := $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/zlib
+
+FCEU_SRC_FILES := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
+
+LOCAL_SRC_FILES  = $(LIBRETRO_DIR)/libretro.c $(LIBRETRO_DIR)/memstream.c $(FCEU_SRC_FILES)
+
+LOCAL_CFLAGS += -DINLINE=inline -DSOUND_QUALITY=0 -DPSS_STYLE=1 -DLSB_FIRST -D__LIBRETRO__ -DHAVE_ASPRINTF -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
+LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(FCEU_DIR)

 include $(BUILD_SHARED_LIBRARY)
--- a/src/drivers/libretro/jni/Application.mk
+++ b/src/drivers/libretro/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
--- a/src/drivers/libretro/libretro.h
+++ b/src/drivers/libretro/libretro.h
--- a/src/drivers/libretro/memstream.c
+++ b/src/drivers/libretro/memstream.c
@@ -9,110 +9,125 @@ static uint8_t *g_buffer = NULL;
 static size_t g_size = 0;
 static size_t g_last_file_size = 0;

-struct memstream {
-	uint8_t *m_buf;
-	size_t m_size;
-	size_t m_ptr;
-	size_t m_max_ptr;
-	bool writing;
+struct memstream
+{
+   uint8_t *m_buf;
+   size_t m_size;
+   size_t m_ptr;
+   size_t m_max_ptr;
+   unsigned writing;
 };

-static void memstream_update_ptr(memstream_t *stream) {
-	if (stream->m_ptr > stream->m_max_ptr)
-		stream->m_max_ptr = stream->m_ptr;
+static void memstream_update_ptr(memstream_t *stream)
+{
+   if (stream->m_ptr > stream->m_max_ptr)
+      stream->m_max_ptr = stream->m_ptr;
 }

-static void memstream_init(memstream_t *stream, uint8_t *buffer, size_t max_size, bool writing) {
+static void memstream_init(memstream_t *stream, uint8_t *buffer, size_t max_size, unsigned writing)
+{
 	stream->m_buf = buffer;
 	stream->m_size = max_size;
 	stream->m_ptr = 0;
 	stream->m_max_ptr = 0;
-	stream->writing = writing;
+   stream->writing = writing;
 }

-void memstream_set_buffer(uint8_t *buffer, size_t size) {
-	g_buffer = buffer;
-	g_size = size;
+void memstream_set_buffer(uint8_t *buffer, size_t size)
+{
+   g_buffer = buffer;
+   g_size = size;
 }

-size_t memstream_get_last_size(void) {
-	return g_last_file_size;
+size_t memstream_get_last_size(void)
+{
+   return g_last_file_size;
 }

-memstream_t *memstream_open(bool writing) {
-	memstream_t *stream;
-	if (!g_buffer || !g_size)
-		return NULL;
+memstream_t *memstream_open(unsigned writing)
+{
+   memstream_t *stream;
+   if (!g_buffer || !g_size)
+      return NULL;

-	stream = (memstream_t*)calloc(1, sizeof(*stream));
-	memstream_init(stream, g_buffer, g_size, writing);
-	g_buffer = NULL;
-	g_size = 0;
-	return stream;
+   stream = (memstream_t*)calloc(1, sizeof(*stream));
+   memstream_init(stream, g_buffer, g_size, writing);
+   g_buffer = NULL;
+   g_size = 0;
+   return stream;
 }

-void memstream_close(memstream_t *stream) {
-	g_last_file_size = stream->writing ? stream->m_max_ptr : stream->m_size;
-	free(stream);
+void memstream_close(memstream_t *stream)
+{
+   g_last_file_size = stream->writing ? stream->m_max_ptr : stream->m_size;
+   free(stream);
 }

-size_t memstream_read(memstream_t *stream, void *data, size_t bytes) {
-	size_t avail = stream->m_size - stream->m_ptr;
-	if (bytes > avail)
-		bytes = avail;
+size_t memstream_read(memstream_t *stream, void *data, size_t bytes)
+{
+   size_t avail = stream->m_size - stream->m_ptr;
+   if (bytes > avail)
+      bytes = avail;

-	memcpy(data, stream->m_buf + stream->m_ptr, bytes);
-	stream->m_ptr += bytes;
-	memstream_update_ptr(stream);
-	return bytes;
+   memcpy(data, stream->m_buf + stream->m_ptr, bytes);
+   stream->m_ptr += bytes;
+   memstream_update_ptr(stream);
+   return bytes;
 }

-size_t memstream_write(memstream_t *stream, const void *data, size_t bytes) {
-	size_t avail = stream->m_size - stream->m_ptr;
-	if (bytes > avail)
-		bytes = avail;
+size_t memstream_write(memstream_t *stream, const void *data, size_t bytes)
+{
+   size_t avail = stream->m_size - stream->m_ptr;
+   if (bytes > avail)
+      bytes = avail;

-	memcpy(stream->m_buf + stream->m_ptr, data, bytes);
-	stream->m_ptr += bytes;
-	memstream_update_ptr(stream);
-	return bytes;
+   memcpy(stream->m_buf + stream->m_ptr, data, bytes);
+   stream->m_ptr += bytes;
+   memstream_update_ptr(stream);
+   return bytes;
 }

-int memstream_seek(memstream_t *stream, int offset, int whence) {
-	size_t ptr;
-	if (whence == SEEK_SET)
-		ptr = offset;
-	else if (whence == SEEK_CUR)
-		ptr = stream->m_ptr + offset;
-	else if (whence == SEEK_END)
-		ptr = (stream->writing ? stream->m_max_ptr : stream->m_size) + offset;
-	else
-		return -1;
+int memstream_seek(memstream_t *stream, int offset, int whence)
+{
+   size_t ptr;
+   if (whence == SEEK_SET)
+      ptr = offset;
+   else if (whence == SEEK_CUR)
+      ptr = stream->m_ptr + offset;
+   else if (whence == SEEK_END)
+      ptr = (stream->writing ? stream->m_max_ptr : stream->m_size) + offset;
+   else
+      return -1;

-	if (ptr <= stream->m_size) {
-		stream->m_ptr = ptr;
-		return 0;
-	} else
-		return -1;
+   if (ptr <= stream->m_size)
+   {
+      stream->m_ptr = ptr;
+      return 0;
+   }
+   else
+      return -1;
 }

-size_t memstream_pos(memstream_t *stream) {
-	return stream->m_ptr;
+size_t memstream_pos(memstream_t *stream)
+{
+   return stream->m_ptr;
 }

-int memstream_getc(memstream_t *stream) {
-	if (stream->m_ptr >= stream->m_size)
-		return EOF;
-	else
-		return stream->m_buf[stream->m_ptr++];
+int memstream_getc(memstream_t *stream)
+{
+   if (stream->m_ptr >= stream->m_size)
+      return EOF;
+   else
+      return stream->m_buf[stream->m_ptr++];

-	memstream_update_ptr(stream);
+   memstream_update_ptr(stream);
 }

-void memstream_putc(memstream_t *stream, int c) {
-	if (stream->m_ptr < stream->m_size)
-		stream->m_buf[stream->m_ptr++] = c;
+void memstream_putc(memstream_t *stream, int c)
+{
+   if (stream->m_ptr < stream->m_size)
+      stream->m_buf[stream->m_ptr++] = c;

-	memstream_update_ptr(stream);
+   memstream_update_ptr(stream);
 }

--- a/src/drivers/libretro/memstream.h
+++ b/src/drivers/libretro/memstream.h
@@ -8,12 +8,11 @@
 #else
 #define TRUE 1
 #define FALSE 0
-typedef unsigned char bool;
 #endif

 typedef struct memstream memstream_t;

-memstream_t *memstream_open(bool writing);
+memstream_t *memstream_open(unsigned writing);
 void memstream_close(memstream_t *stream);

 size_t memstream_read(memstream_t *stream, void *data, size_t bytes);
--- a/src/drivers/libretro/msvc/msvc-2003-xbox1.bat
+++ b/src/drivers/libretro/msvc/msvc-2003-xbox1.bat
@@ -0,0 +1,47 @@
+@SET VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
+@SET VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio .NET 2003
+@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework
+@SET FrameworkVersion=v1.1.4322
+@SET FrameworkSDKDir=C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1
+@rem Root of Visual Studio common files.
+
+@if "%VSINSTALLDIR%"=="" goto Usage
+@if "%VCINSTALLDIR%"=="" set VCINSTALLDIR=%VSINSTALLDIR%
+
+@rem
+@rem Root of Visual Studio ide installed files.
+@rem
+@set DevEnvDir=%VSINSTALLDIR%
+
+@rem
+@rem Root of Visual C++ installed files.
+@rem
+@set MSVCDir=%VCINSTALLDIR%\VC7
+
+@rem
+@echo Setting environment for using Microsoft Visual Studio .NET 2003 tools.
+@echo (If you have another version of Visual Studio or Visual C++ installed and wish
+@echo to use its tools from the command line, run vcvars32.bat for that version.)
+@rem
+
+@REM %VCINSTALLDIR%\Common7\Tools dir is added only for real setup.
+
+@set PATH=%DevEnvDir%;%MSVCDir%\BIN;%VCINSTALLDIR%\Common7\Tools;%VCINSTALLDIR%\Common7\Tools\bin\prerelease;%VCINSTALLDIR%\Common7\Tools\bin;%FrameworkSDKDir%\bin;%FrameworkDir%\%FrameworkVersion%;%PATH%;
+@set INCLUDE=%MSVCDir%\ATLMFC\INCLUDE;%MSVCDir%\INCLUDE;%FrameworkSDKDir%\include;%INCLUDE%;%XDK%\xbox\include
+@set LIB=%MSVCDir%\ATLMFC\LIB;%MSVCDir%\LIB;%MSVCDir%\PlatformSDK\lib;%XDK%\lib;%XDK%\xbox\lib;%LIB%
+
+@goto end
+
+:Usage
+
+@echo. VSINSTALLDIR variable is not set. 
+@echo.
+@echo SYNTAX: %0
+
+@goto end
+
+:end
+
+devenv /clean Release_LTCG msvc-2003-xbox1.sln
+devenv /build Release_LTCG msvc-2003-xbox1.sln
+exit
--- a/src/drivers/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
+++ b/src/drivers/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
--- a/src/drivers/libretro/msvc/msvc-2010-360.bat
+++ b/src/drivers/libretro/msvc/msvc-2010-360.bat
@@ -0,0 +1,124 @@
+@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-360.sln /p:Configuration=Release_LTCG /target:clean
+msbuild msvc-2010-360.sln /p:Configuration=Release_LTCG
+exit
--- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
--- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
+++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
--- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.user
+++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
--- a/src/drivers/libretro/msvc/msvc-2010.bat
+++ b/src/drivers/libretro/msvc/msvc-2010.bat
@@ -0,0 +1,124 @@
+@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
--- a/src/drivers/libretro/msvc/msvc-2010.sln
+++ b/src/drivers/libretro/msvc/msvc-2010.sln
@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceu-next", "msvc-2010\msvc-2010.vcxproj", "{0CE28350-1810-43E8-BB42-EC5C562C1C66}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0CE28350-1810-43E8-BB42-EC5C562C1C66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0CE28350-1810-43E8-BB42-EC5C562C1C66}.Debug|Win32.Build.0 = Debug|Win32
-		{0CE28350-1810-43E8-BB42-EC5C562C1C66}.Release|Win32.ActiveCfg = Release|Win32
-		{0CE28350-1810-43E8-BB42-EC5C562C1C66}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceu-next-360", "msvc-2010\msvc-2010.vcxproj", "{3FF56BB8-80B9-4477-9B55-248DFEFF7469}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3FF56BB8-80B9-4477-9B55-248DFEFF7469}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3FF56BB8-80B9-4477-9B55-248DFEFF7469}.Debug|Win32.Build.0 = Debug|Win32
+		{3FF56BB8-80B9-4477-9B55-248DFEFF7469}.Release|Win32.ActiveCfg = Release|Win32
+		{3FF56BB8-80B9-4477-9B55-248DFEFF7469}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/src/drivers/libretro/msvc/msvc-2010/libretro.def
+++ b/src/drivers/libretro/msvc/msvc-2010/libretro.def
@@ -1,4 +1,4 @@
-LIBRARY "libretro-prboom msvc2010"
+LIBRARY "msvc-2010"
 EXPORTS
 retro_set_environment
 retro_set_video_refresh
--- a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
--- a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters