msvc buildfixes

This commit is contained in:
Brad Parker 2019-07-29 21:33:39 -04:00
parent 05b5591b67
commit cf0425111f
3 changed files with 11 additions and 10 deletions

View File

@ -438,7 +438,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin")
@ -479,7 +479,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
HAVE_CDROM = 1
PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/include")
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/lib")
BIN := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin")

View File

@ -26,6 +26,7 @@
#ifdef _MSC_VER
#ifdef __cplusplus
#include <complex>
extern "C" {
#endif

View File

@ -239,10 +239,10 @@ static const InputDeviceInputInfoStruct GamepadIDII[] =
{ "ii", "II", 11, IDIT_BUTTON_CAN_RAPID, NULL },
{ "select", "SELECT", 4, IDIT_BUTTON, NULL },
{ "run", "RUN", 5, IDIT_BUTTON, NULL },
{ "up", "UP", 0, IDIT_BUTTON, "down" },
{ "right", "RIGHT", 3, IDIT_BUTTON, "left" },
{ "down", "DOWN", 1, IDIT_BUTTON, "up" },
{ "left", "LEFT", 2, IDIT_BUTTON, "right" },
{ "up", "UP", 0, IDIT_BUTTON, "down" },
{ "right", "RIGHT", 3, IDIT_BUTTON, "left" },
{ "down", "DOWN", 1, IDIT_BUTTON, "up" },
{ "left", "LEFT", 2, IDIT_BUTTON, "right" },
{ "iii", "III", 10, IDIT_BUTTON, NULL },
{ "iv", "IV", 7, IDIT_BUTTON, NULL },
{ "v", "V", 8, IDIT_BUTTON, NULL },
@ -255,10 +255,10 @@ static const InputDeviceInputInfoStruct GamepadIDII_DSR[] =
{ "ii", "II", 11, IDIT_BUTTON_CAN_RAPID, NULL },
{ "select", "SELECT", 4, IDIT_BUTTON, "run" },
{ "run", "RUN", 5, IDIT_BUTTON, "select" },
{ "up", "UP", 0, IDIT_BUTTON, "down" },
{ "right", "RIGHT", 3, IDIT_BUTTON, "left" },
{ "down", "DOWN", 1, IDIT_BUTTON, "up" },
{ "left", "LEFT", 2, IDIT_BUTTON, "right" },
{ "up", "UP", 0, IDIT_BUTTON, "down" },
{ "right", "RIGHT", 3, IDIT_BUTTON, "left" },
{ "down", "DOWN", 1, IDIT_BUTTON, "up" },
{ "left", "LEFT", 2, IDIT_BUTTON, "right" },
{ "iii", "III", 10, IDIT_BUTTON, NULL },
{ "iv", "IV", 7, IDIT_BUTTON, NULL },
{ "v", "V", 8, IDIT_BUTTON, NULL },