diff --git a/README.md b/README.md index 09718cb49..b8d6ad67e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ and linux: ## windows -- grab the [Visual Studio 2015 Community Edition](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx) and install the C++ compiler and tools. the 32-bit compiler is currently used. +- grab the [Visual Studio 2017 Community Edition](https://www.visualstudio.com/vs/visual-studio-2017-rc/) and install the C++ compiler and tools. the 32-bit compiler is currently used. - clone the musikcube sources: `git clone https://github.com/clangen/musikcube.git` - install the [32 bit version of boost 1.60](https://sourceforge.net/projects/boost/files/boost-binaries/1.60.0/boost_1_60_0-msvc-14.0-32.exe/download). ensure it shares the same parent directory with musikcube. e.g: `c:\src\musikcube` and `c:\src\boost_1_60_0` -- the project's solution will reference it via relative path. - open `musikcube.sln` and build/run. diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj index 8619cab91..eb25c9ccf 100755 --- a/src/3rdparty/3rdparty.vcxproj +++ b/src/3rdparty/3rdparty.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,12 +19,12 @@ StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/src/3rdparty/lib/pdcurses.lib b/src/3rdparty/lib/pdcurses.lib deleted file mode 100755 index 41722aa5b..000000000 Binary files a/src/3rdparty/lib/pdcurses.lib and /dev/null differ diff --git a/src/3rdparty/win32_include/curses.h b/src/3rdparty/win32_include/curses.h index f1cfb2f69..1e9844faa 100755 --- a/src/3rdparty/win32_include/curses.h +++ b/src/3rdparty/win32_include/curses.h @@ -473,9 +473,6 @@ fifteen bits, five bits for each of the three channels) and background RGB | ((chtype)(gback) << 5) \ | ((chtype)(rback) )) << PDC_COLOR_SHIFT) | A_RGB_COLOR) # else /* plain ol' 32-bit chtypes */ - # define A_OVERLINE A_NORMAL - # define A_STRIKEOUT A_NORMAL - # define A_ATTRIBUTES (chtype)0xffff0000 # define A_ALTCHARSET (chtype)0x00010000 # define A_RIGHTLINE (chtype)0x00020000 # define A_LEFTLINE (chtype)0x00040000 @@ -484,10 +481,21 @@ fifteen bits, five bits for each of the three channels) and background RGB # define A_REVERSE (chtype)0x00200000 # define A_BLINK (chtype)0x00400000 # define A_BOLD (chtype)0x00800000 - # define A_CHARTEXT (chtype)0x0000ffff # define A_COLOR (chtype)0xff000000 # define A_RGB_COLOR A_NORMAL +#ifdef PDC_WIDE + # define A_CHARTEXT (chtype)0x0000ffff + # define A_ATTRIBUTES (chtype)0xffff0000 # define A_DIM A_NORMAL + # define A_OVERLINE A_NORMAL + # define A_STRIKEOUT A_NORMAL +#else /* with 8-bit chars, we have bits for these attribs : */ + # define A_CHARTEXT (chtype)0x000000ff + # define A_ATTRIBUTES (chtype)0xffffe000 + # define A_DIM (chtype)0x00008000 + # define A_OVERLINE (chtype)0x00004000 + # define A_STRIKEOUT (chtype)0x00002000 +#endif # define PDC_COLOR_SHIFT 24 #endif @@ -507,6 +515,8 @@ fifteen bits, five bits for each of the three channels) and background RGB # define A_ALTCHARSET A_NORMAL /* X/Open */ # define A_PROTECT A_NORMAL /* X/Open */ # define A_UNDERLINE A_NORMAL /* X/Open */ +# define A_OVERLINE A_NORMAL /* X/Open */ +# define A_STRIKEOUT A_NORMAL /* X/Open */ # define A_LEFTLINE A_NORMAL # define A_RIGHTLINE A_NORMAL @@ -562,50 +572,141 @@ fifteen bits, five bits for each of the three channels) and background RGB /* VT100-compatible symbols -- box chars */ -#define ACS_ULCORNER ACS_PICK('l', '+') -#define ACS_LLCORNER ACS_PICK('m', '+') -#define ACS_URCORNER ACS_PICK('k', '+') -#define ACS_LRCORNER ACS_PICK('j', '+') -#define ACS_RTEE ACS_PICK('u', '+') -#define ACS_LTEE ACS_PICK('t', '+') -#define ACS_BTEE ACS_PICK('v', '+') -#define ACS_TTEE ACS_PICK('w', '+') -#define ACS_HLINE ACS_PICK('q', '-') -#define ACS_VLINE ACS_PICK('x', '|') -#define ACS_PLUS ACS_PICK('n', '+') +#define ACS_LRCORNER ACS_PICK('V', '+') +#define ACS_URCORNER ACS_PICK('W', '+') +#define ACS_ULCORNER ACS_PICK('X', '+') +#define ACS_LLCORNER ACS_PICK('Y', '+') +#define ACS_PLUS ACS_PICK('Z', '+') +#define ACS_LTEE ACS_PICK('[', '+') +#define ACS_RTEE ACS_PICK('\\', '+') +#define ACS_BTEE ACS_PICK(']', '+') +#define ACS_TTEE ACS_PICK('^', '+') +#define ACS_HLINE ACS_PICK('_', '-') +#define ACS_VLINE ACS_PICK('`', '|') + +/* PDCurses-only ACS chars. Don't use if ncurses compatibility matters. +Some won't work in non-wide X11 builds (see 'acs_defs.h' for details). */ + +#define ACS_CENT ACS_PICK('{', 'c') +#define ACS_YEN ACS_PICK('|', 'y') +#define ACS_PESETA ACS_PICK('}', 'p') +#define ACS_HALF ACS_PICK('&', '/') +#define ACS_QUARTER ACS_PICK('\'', '/') +#define ACS_LEFT_ANG_QU ACS_PICK(')', '<') +#define ACS_RIGHT_ANG_QU ACS_PICK('*', '>') +#define ACS_D_HLINE ACS_PICK('a', '-') +#define ACS_D_VLINE ACS_PICK('b', '|') +#define ACS_CLUB ACS_PICK( 11, 'C') +#define ACS_HEART ACS_PICK( 12, 'H') +#define ACS_SPADE ACS_PICK( 13, 'S') +#define ACS_SMILE ACS_PICK( 14, 'O') +#define ACS_REV_SMILE ACS_PICK( 15, 'O') +#define ACS_MED_BULLET ACS_PICK( 16, '.') +#define ACS_WHITE_BULLET ACS_PICK( 17, 'O') +#define ACS_PILCROW ACS_PICK( 18, 'O') +#define ACS_SECTION ACS_PICK( 19, 'O') + +#define ACS_SUP2 ACS_PICK(',', '2') +#define ACS_ALPHA ACS_PICK('.', 'a') +#define ACS_BETA ACS_PICK('/', 'b') +#define ACS_GAMMA ACS_PICK('0', 'y') +#define ACS_UP_SIGMA ACS_PICK('1', 'S') +#define ACS_LO_SIGMA ACS_PICK('2', 's') +#define ACS_MU ACS_PICK('4', 'u') +#define ACS_TAU ACS_PICK('5', 't') +#define ACS_UP_PHI ACS_PICK('6', 'F') +#define ACS_THETA ACS_PICK('7', 't') +#define ACS_OMEGA ACS_PICK('8', 'w') +#define ACS_DELTA ACS_PICK('9', 'd') +#define ACS_INFINITY ACS_PICK('-', 'i') +#define ACS_LO_PHI ACS_PICK( 22, 'f') +#define ACS_EPSILON ACS_PICK(':', 'e') +#define ACS_INTERSECT ACS_PICK('e', 'u') +#define ACS_TRIPLE_BAR ACS_PICK('f', '=') +#define ACS_DIVISION ACS_PICK('c', '/') +#define ACS_APPROX_EQ ACS_PICK('d', '~') +#define ACS_SM_BULLET ACS_PICK('g', '.') +#define ACS_SQUARE_ROOT ACS_PICK('i', '!') +#define ACS_UBLOCK ACS_PICK('p', '^') +#define ACS_BBLOCK ACS_PICK('q', '_') +#define ACS_LBLOCK ACS_PICK('r', '<') +#define ACS_RBLOCK ACS_PICK('s', '>') + +#define ACS_A_ORDINAL ACS_PICK(20, 'a') +#define ACS_O_ORDINAL ACS_PICK(21, 'o') +#define ACS_INV_QUERY ACS_PICK(24, '?') +#define ACS_REV_NOT ACS_PICK(25, '!') +#define ACS_NOT ACS_PICK(26, '!') +#define ACS_INV_BANG ACS_PICK(23, '!') +#define ACS_UP_INTEGRAL ACS_PICK(27, '|') +#define ACS_LO_INTEGRAL ACS_PICK(28, '|') +#define ACS_SUP_N ACS_PICK(29, 'n') +#define ACS_CENTER_SQU ACS_PICK(30, 'x') +#define ACS_F_WITH_HOOK ACS_PICK(31, 'f') + +#define ACS_SD_LRCORNER ACS_PICK(';', '+') +#define ACS_SD_URCORNER ACS_PICK('<', '+') +#define ACS_SD_ULCORNER ACS_PICK('=', '+') +#define ACS_SD_LLCORNER ACS_PICK('>', '+') +#define ACS_SD_PLUS ACS_PICK('?', '+') +#define ACS_SD_LTEE ACS_PICK('@', '+') +#define ACS_SD_RTEE ACS_PICK('A', '+') +#define ACS_SD_BTEE ACS_PICK('B', '+') +#define ACS_SD_TTEE ACS_PICK('C', '+') + +#define ACS_D_LRCORNER ACS_PICK('D', '+') +#define ACS_D_URCORNER ACS_PICK('E', '+') +#define ACS_D_ULCORNER ACS_PICK('F', '+') +#define ACS_D_LLCORNER ACS_PICK('G', '+') +#define ACS_D_PLUS ACS_PICK('H', '+') +#define ACS_D_LTEE ACS_PICK('I', '+') +#define ACS_D_RTEE ACS_PICK('J', '+') +#define ACS_D_BTEE ACS_PICK('K', '+') +#define ACS_D_TTEE ACS_PICK('L', '+') + +#define ACS_DS_LRCORNER ACS_PICK('M', '+') +#define ACS_DS_URCORNER ACS_PICK('N', '+') +#define ACS_DS_ULCORNER ACS_PICK('O', '+') +#define ACS_DS_LLCORNER ACS_PICK('P', '+') +#define ACS_DS_PLUS ACS_PICK('Q', '+') +#define ACS_DS_LTEE ACS_PICK('R', '+') +#define ACS_DS_RTEE ACS_PICK('S', '+') +#define ACS_DS_BTEE ACS_PICK('T', '+') +#define ACS_DS_TTEE ACS_PICK('U', '+') /* VT100-compatible symbols -- other */ -#define ACS_S1 ACS_PICK('o', '-') -#define ACS_S9 ACS_PICK('s', '_') -#define ACS_DIAMOND ACS_PICK('`', '+') -#define ACS_CKBOARD ACS_PICK('a', ':') -#define ACS_DEGREE ACS_PICK('f', '\'') -#define ACS_PLMINUS ACS_PICK('g', '#') -#define ACS_BULLET ACS_PICK('~', 'o') +#define ACS_S1 ACS_PICK('l', '-') +#define ACS_S9 ACS_PICK('o', '_') +#define ACS_DIAMOND ACS_PICK('j', '+') +#define ACS_CKBOARD ACS_PICK('k', ':') +#define ACS_DEGREE ACS_PICK('w', '\'') +#define ACS_PLMINUS ACS_PICK('x', '#') +#define ACS_BULLET ACS_PICK('h', 'o') /* Teletype 5410v1 symbols -- these are defined in SysV curses, but are not well-supported by most terminals. Stick to VT100 characters for optimum portability. */ -#define ACS_LARROW ACS_PICK(',', '<') -#define ACS_RARROW ACS_PICK('+', '>') -#define ACS_DARROW ACS_PICK('.', 'v') -#define ACS_UARROW ACS_PICK('-', '^') -#define ACS_BOARD ACS_PICK('h', '#') -#define ACS_LANTERN ACS_PICK('i', '*') -#define ACS_BLOCK ACS_PICK('0', '#') +#define ACS_LARROW ACS_PICK('!', '<') +#define ACS_RARROW ACS_PICK(' ', '>') +#define ACS_DARROW ACS_PICK('#', 'v') +#define ACS_UARROW ACS_PICK('"', '^') +#define ACS_BOARD ACS_PICK('+', '#') +#define ACS_LTBOARD ACS_PICK('y', '#') +#define ACS_LANTERN ACS_PICK('z', '*') +#define ACS_BLOCK ACS_PICK('t', '#') /* That goes double for these -- undocumented SysV symbols. Don't use them. */ -#define ACS_S3 ACS_PICK('p', '-') -#define ACS_S7 ACS_PICK('r', '-') -#define ACS_LEQUAL ACS_PICK('y', '<') -#define ACS_GEQUAL ACS_PICK('z', '>') -#define ACS_PI ACS_PICK('{', 'n') -#define ACS_NEQUAL ACS_PICK('|', '+') -#define ACS_STERLING ACS_PICK('}', 'L') +#define ACS_S3 ACS_PICK('m', '-') +#define ACS_S7 ACS_PICK('n', '-') +#define ACS_LEQUAL ACS_PICK('u', '<') +#define ACS_GEQUAL ACS_PICK('v', '>') +#define ACS_PI ACS_PICK('$', 'n') +#define ACS_NEQUAL ACS_PICK('%', '+') +#define ACS_STERLING ACS_PICK('~', 'L') /* Box char aliases */ @@ -624,41 +725,130 @@ fifteen bits, five bits for each of the three channels) and background RGB /* cchar_t aliases */ #ifdef PDC_WIDE -# define WACS_ULCORNER (&(acs_map['l'])) -# define WACS_LLCORNER (&(acs_map['m'])) -# define WACS_URCORNER (&(acs_map['k'])) -# define WACS_LRCORNER (&(acs_map['j'])) -# define WACS_RTEE (&(acs_map['u'])) -# define WACS_LTEE (&(acs_map['t'])) -# define WACS_BTEE (&(acs_map['v'])) -# define WACS_TTEE (&(acs_map['w'])) -# define WACS_HLINE (&(acs_map['q'])) -# define WACS_VLINE (&(acs_map['x'])) -# define WACS_PLUS (&(acs_map['n'])) +# define WACS_LRCORNER (&(acs_map['V'])) +# define WACS_URCORNER (&(acs_map['W'])) +# define WACS_ULCORNER (&(acs_map['X'])) +# define WACS_LLCORNER (&(acs_map['Y'])) +# define WACS_PLUS (&(acs_map['Z'])) +# define WACS_LTEE (&(acs_map['['])) +# define WACS_RTEE (&(acs_map['\\'])) +# define WACS_BTEE (&(acs_map[']'])) +# define WACS_TTEE (&(acs_map['^'])) +# define WACS_HLINE (&(acs_map['_'])) +# define WACS_VLINE (&(acs_map['`'])) -# define WACS_S1 (&(acs_map['o'])) -# define WACS_S9 (&(acs_map['s'])) -# define WACS_DIAMOND (&(acs_map['`'])) -# define WACS_CKBOARD (&(acs_map['a'])) -# define WACS_DEGREE (&(acs_map['f'])) -# define WACS_PLMINUS (&(acs_map['g'])) -# define WACS_BULLET (&(acs_map['~'])) +# define WACS_CENT (&(acs_map['{'])) +# define WACS_YEN (&(acs_map['|'])) +# define WACS_PESETA (&(acs_map['}'])) +# define WACS_HALF (&(acs_map['&'])) +# define WACS_QUARTER (&(acs_map['\''])) +# define WACS_LEFT_ANG_QU (&(acs_map[')'])) +# define WACS_RIGHT_ANG_QU (&(acs_map['*'])) +# define WACS_D_HLINE (&(acs_map['a'])) +# define WACS_D_VLINE (&(acs_map['b'])) +# define WACS_CLUB (&(acs_map[ 11])) +# define WACS_HEART (&(acs_map[ 12])) +# define WACS_SPADE (&(acs_map[ 13])) +# define WACS_SMILE (&(acs_map[ 14])) +# define WACS_REV_SMILE (&(acs_map[ 15])) +# define WACS_MED_BULLET (&(acs_map[ 16])) +# define WACS_WHITE_BULLET (&(acs_map[ 17])) +# define WACS_PILCROW (&(acs_map[ 18])) +# define WACS_SECTION (&(acs_map[ 19])) -# define WACS_LARROW (&(acs_map[','])) -# define WACS_RARROW (&(acs_map['+'])) -# define WACS_DARROW (&(acs_map['.'])) -# define WACS_UARROW (&(acs_map['-'])) -# define WACS_BOARD (&(acs_map['h'])) -# define WACS_LANTERN (&(acs_map['i'])) -# define WACS_BLOCK (&(acs_map['0'])) +# define WACS_SUP2 (&(acs_map[','])) +# define WACS_ALPHA (&(acs_map['.'])) +# define WACS_BETA (&(acs_map['/'])) +# define WACS_GAMMA (&(acs_map['0'])) +# define WACS_UP_SIGMA (&(acs_map['1'])) +# define WACS_LO_SIGMA (&(acs_map['2'])) +# define WACS_MU (&(acs_map['4'])) +# define WACS_TAU (&(acs_map['5'])) +# define WACS_UP_PHI (&(acs_map['6'])) +# define WACS_THETA (&(acs_map['7'])) +# define WACS_OMEGA (&(acs_map['8'])) +# define WACS_DELTA (&(acs_map['9'])) +# define WACS_INFINITY (&(acs_map['-'])) +# define WACS_LO_PHI (&(acs_map[ 22])) +# define WACS_EPSILON (&(acs_map[':'])) +# define WACS_INTERSECT (&(acs_map['e'])) +# define WACS_TRIPLE_BAR (&(acs_map['f'])) +# define WACS_DIVISION (&(acs_map['c'])) +# define WACS_APPROX_EQ (&(acs_map['d'])) +# define WACS_SM_BULLET (&(acs_map['g'])) +# define WACS_SQUARE_ROOT (&(acs_map['i'])) +# define WACS_UBLOCK (&(acs_map['p'])) +# define WACS_BBLOCK (&(acs_map['q'])) +# define WACS_LBLOCK (&(acs_map['r'])) +# define WACS_RBLOCK (&(acs_map['s'])) -# define WACS_S3 (&(acs_map['p'])) -# define WACS_S7 (&(acs_map['r'])) -# define WACS_LEQUAL (&(acs_map['y'])) -# define WACS_GEQUAL (&(acs_map['z'])) -# define WACS_PI (&(acs_map['{'])) -# define WACS_NEQUAL (&(acs_map['|'])) -# define WACS_STERLING (&(acs_map['}'])) +# define WACS_A_ORDINAL (&(acs_map[20])) +# define WACS_O_ORDINAL (&(acs_map[21])) +# define WACS_INV_QUERY (&(acs_map[24])) +# define WACS_REV_NOT (&(acs_map[25])) +# define WACS_NOT (&(acs_map[26])) +# define WACS_INV_BANG (&(acs_map[23])) +# define WACS_UP_INTEGRAL (&(acs_map[27])) +# define WACS_LO_INTEGRAL (&(acs_map[28])) +# define WACS_SUP_N (&(acs_map[29])) +# define WACS_CENTER_SQU (&(acs_map[30])) +# define WACS_F_WITH_HOOK (&(acs_map[31])) + +# define WACS_SD_LRCORNER (&(acs_map[';'])) +# define WACS_SD_URCORNER (&(acs_map['<'])) +# define WACS_SD_ULCORNER (&(acs_map['='])) +# define WACS_SD_LLCORNER (&(acs_map['>'])) +# define WACS_SD_PLUS (&(acs_map['?'])) +# define WACS_SD_LTEE (&(acs_map['@'])) +# define WACS_SD_RTEE (&(acs_map['A'])) +# define WACS_SD_BTEE (&(acs_map['B'])) +# define WACS_SD_TTEE (&(acs_map['C'])) + +# define WACS_D_LRCORNER (&(acs_map['D'])) +# define WACS_D_URCORNER (&(acs_map['E'])) +# define WACS_D_ULCORNER (&(acs_map['F'])) +# define WACS_D_LLCORNER (&(acs_map['G'])) +# define WACS_D_PLUS (&(acs_map['H'])) +# define WACS_D_LTEE (&(acs_map['I'])) +# define WACS_D_RTEE (&(acs_map['J'])) +# define WACS_D_BTEE (&(acs_map['K'])) +# define WACS_D_TTEE (&(acs_map['L'])) + +# define WACS_DS_LRCORNER (&(acs_map['M'])) +# define WACS_DS_URCORNER (&(acs_map['N'])) +# define WACS_DS_ULCORNER (&(acs_map['O'])) +# define WACS_DS_LLCORNER (&(acs_map['P'])) +# define WACS_DS_PLUS (&(acs_map['Q'])) +# define WACS_DS_LTEE (&(acs_map['R'])) +# define WACS_DS_RTEE (&(acs_map['S'])) +# define WACS_DS_BTEE (&(acs_map['T'])) +# define WACS_DS_TTEE (&(acs_map['U'])) + +# define WACS_S1 (&(acs_map['l'])) +# define WACS_S9 (&(acs_map['o'])) +# define WACS_DIAMOND (&(acs_map['j'])) +# define WACS_CKBOARD (&(acs_map['k'])) +# define WACS_DEGREE (&(acs_map['w'])) +# define WACS_PLMINUS (&(acs_map['x'])) +# define WACS_BULLET (&(acs_map['h'])) + + +# define WACS_LARROW (&(acs_map['!'])) +# define WACS_RARROW (&(acs_map[' '])) +# define WACS_DARROW (&(acs_map['#'])) +# define WACS_UARROW (&(acs_map['"'])) +# define WACS_BOARD (&(acs_map['+'])) +# define WACS_LTBOARD (&(acs_map['y'])) +# define WACS_LANTERN (&(acs_map['z'])) +# define WACS_BLOCK (&(acs_map['t'])) + +# define WACS_S3 (&(acs_map['m'])) +# define WACS_S7 (&(acs_map['n'])) +# define WACS_LEQUAL (&(acs_map['u'])) +# define WACS_GEQUAL (&(acs_map['v'])) +# define WACS_PI (&(acs_map['$'])) +# define WACS_NEQUAL (&(acs_map['%'])) +# define WACS_STERLING (&(acs_map['~'])) # define WACS_BSSB WACS_ULCORNER # define WACS_SSBB WACS_LLCORNER diff --git a/src/3rdparty/win32_lib/pdcurses.lib b/src/3rdparty/win32_lib/pdcurses.lib new file mode 100644 index 000000000..94c4c28e0 Binary files /dev/null and b/src/3rdparty/win32_lib/pdcurses.lib differ diff --git a/src/3rdparty/lib/pdcursesd.lib b/src/3rdparty/win32_lib/pdcursesD.lib old mode 100755 new mode 100644 similarity index 53% rename from src/3rdparty/lib/pdcursesd.lib rename to src/3rdparty/win32_lib/pdcursesD.lib index 1352109f7..f53343949 Binary files a/src/3rdparty/lib/pdcursesd.lib and b/src/3rdparty/win32_lib/pdcursesD.lib differ diff --git a/src/contrib/cddadecoder/cddadecoder.vcxproj b/src/contrib/cddadecoder/cddadecoder.vcxproj index 06976df32..8a2c38a4d 100755 --- a/src/contrib/cddadecoder/cddadecoder.vcxproj +++ b/src/contrib/cddadecoder/cddadecoder.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - v140 + v141 DynamicLibrary MultiByte - v140 + v141 diff --git a/src/contrib/flacdecoder/flacdecoder.vcxproj b/src/contrib/flacdecoder/flacdecoder.vcxproj index af27007b2..045a3c464 100755 --- a/src/contrib/flacdecoder/flacdecoder.vcxproj +++ b/src/contrib/flacdecoder/flacdecoder.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,13 +18,13 @@ DynamicLibrary - v140 + v141 Unicode true DynamicLibrary - v140 + v141 Unicode @@ -67,7 +67,7 @@ EditAndContinue - /NODEFAULTLIB:LIBCMT + /NODEFAULTLIB:LIBCMT %(AdditionalOptions) ./lib;../../3rdparty/lib;%(AdditionalLibraryDirectories) true diff --git a/src/contrib/m4adecoder/m4adecoder.vcxproj b/src/contrib/m4adecoder/m4adecoder.vcxproj index c3cf7484e..7d6ca720e 100755 --- a/src/contrib/m4adecoder/m4adecoder.vcxproj +++ b/src/contrib/m4adecoder/m4adecoder.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,13 +20,13 @@ DynamicLibrary - v140 + v141 Unicode true DynamicLibrary - v140 + v141 Unicode @@ -208,4 +208,4 @@ - + \ No newline at end of file diff --git a/src/contrib/mpg123decoder/mpg123decoder.vcxproj b/src/contrib/mpg123decoder/mpg123decoder.vcxproj index 96ee422b7..98abaaaa8 100755 --- a/src/contrib/mpg123decoder/mpg123decoder.vcxproj +++ b/src/contrib/mpg123decoder/mpg123decoder.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ DynamicLibrary - v140 + v141 Unicode true DynamicLibrary - v140 + v141 Unicode @@ -109,7 +109,6 @@ - diff --git a/src/contrib/mpg123decoder/mpg123decoder.vcxproj.filters b/src/contrib/mpg123decoder/mpg123decoder.vcxproj.filters index 0ea58d56e..174976e13 100755 --- a/src/contrib/mpg123decoder/mpg123decoder.vcxproj.filters +++ b/src/contrib/mpg123decoder/mpg123decoder.vcxproj.filters @@ -27,7 +27,6 @@ plugin - plugin diff --git a/src/contrib/oggdecoder/oggdecoder.vcxproj b/src/contrib/oggdecoder/oggdecoder.vcxproj index 4e4bd2e64..000f7c651 100755 --- a/src/contrib/oggdecoder/oggdecoder.vcxproj +++ b/src/contrib/oggdecoder/oggdecoder.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ DynamicLibrary Unicode true - v140 + v141 DynamicLibrary Unicode - v140 + v141 @@ -67,7 +67,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb - /NODEFAULTLIB:LIBCMT + /NODEFAULTLIB:LIBCMT %(AdditionalOptions) %(AdditionalDependencies) ./lib;../../3rdparty/lib;../../../../boost_1_60_0/lib32-msvc-14.0;%(AdditionalLibraryDirectories) diff --git a/src/contrib/taglib_plugin/taglib_plugin.vcxproj b/src/contrib/taglib_plugin/taglib_plugin.vcxproj index e37ff44af..413075ed8 100755 --- a/src/contrib/taglib_plugin/taglib_plugin.vcxproj +++ b/src/contrib/taglib_plugin/taglib_plugin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - v140 + v141 DynamicLibrary MultiByte - v140 + v141 @@ -224,7 +224,6 @@ - diff --git a/src/contrib/taglib_plugin/taglib_plugin.vcxproj.filters b/src/contrib/taglib_plugin/taglib_plugin.vcxproj.filters index 1cb06b158..1b8101b5f 100755 --- a/src/contrib/taglib_plugin/taglib_plugin.vcxproj.filters +++ b/src/contrib/taglib_plugin/taglib_plugin.vcxproj.filters @@ -669,9 +669,6 @@ taglib-1.11 - - taglib-1.11 - plugin diff --git a/src/contrib/waveout/waveout.vcxproj b/src/contrib/waveout/waveout.vcxproj index 74d172aa0..d4c019fab 100755 --- a/src/contrib/waveout/waveout.vcxproj +++ b/src/contrib/waveout/waveout.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,12 +17,12 @@ DynamicLibrary - v140 + v141 Unicode DynamicLibrary - v140 + v141 Unicode diff --git a/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj b/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj index 16fdf698e..a93998c16 100644 --- a/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj +++ b/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,12 +18,12 @@ DynamicLibrary - v140 + v141 Unicode DynamicLibrary - v140 + v141 Unicode diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 110f3d4a4..2f3fcb16a 100755 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/src/musikbox/musikbox.vcxproj b/src/musikbox/musikbox.vcxproj index a87a9f332..755a3e90f 100755 --- a/src/musikbox/musikbox.vcxproj +++ b/src/musikbox/musikbox.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,14 +22,14 @@ Application MultiByte true - v140 + v141 Application false false MultiByte - v140 + v141 @@ -72,7 +72,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb - ../3rdparty/lib;../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_bin;%(AdditionalLibraryDirectories) + ../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_lib;../3rdparty/win32_bin;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Windows @@ -98,7 +98,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb - ../3rdparty/lib;../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_bin;%(AdditionalLibraryDirectories) + ../../../boost_1_60_0/lib32-msvc-14.0;../3rdparty/win32_lib;../3rdparty/win32_bin;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Windows