joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-win-sdl1-async-hack-201802

Browse Source
This commit is contained in:
Jonathan Campbell 2018-02-20 22:20:32 -08:00
commit ebac8efe2a
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitignore vendored
View File

@ -334,3 +334,30 @@ vs2015/sdl/linux-build/*
vs2015/sdl/include/SDL_config.h
/vs2015/libpdcurses/wincon/xmas.exe
/vs2015/libpdcurses/wincon/worm.exe
/vs2015/libpdcurses/wincon/tuidemo.exe
/vs2015/libpdcurses/wincon/testcurs.exe
/vs2015/libpdcurses/wincon/rain.exe
/vs2015/libpdcurses/wincon/ptest.exe
/vs2015/libpdcurses/wincon/pdcurses.lib
/vs2015/libpdcurses/wincon/ozdemo.exe
/vs2015/libpdcurses/wincon/firework.exe
/vs2015/libpdcurses/wincon/xmas.exe
/vs2015/libpdcurses/wincon/worm.exe
/vs2015/libpdcurses/wincon/tuidemo.exe
/vs2015/libpdcurses/wincon/testcurs.exe
/vs2015/libpdcurses/wincon/rain.exe
/vs2015/libpdcurses/wincon/ptest.exe
/vs2015/libpdcurses/wincon/pdcurses.lib
/vs2015/libpdcurses/wincon/ozdemo.exe
/vs2015/libpdcurses/wincon/firework.exe
/vs2015/libpdcurses/wincon/xmas.exe
/vs2015/libpdcurses/wincon/worm.exe
/vs2015/libpdcurses/wincon/tuidemo.exe
/vs2015/libpdcurses/wincon/testcurs.exe
/vs2015/libpdcurses/wincon/rain.exe
/vs2015/libpdcurses/wincon/ptest.exe
/vs2015/libpdcurses/wincon/pdcurses.lib
/vs2015/libpdcurses/wincon/ozdemo.exe
/vs2015/libpdcurses/wincon/firework.exe

2
vs2015/config.h
View File

@ -39,7 +39,9 @@
#define C_D3DSHADERS 1
/* Define to 1 to enable internal debugger, requires libcurses */
#if defined(WIN32) && !defined(_WIN64) && !defined(C_SDL2)
#define C_DEBUG 1
#endif
/* Define to 1 if you want parallel passthrough support (Win32, Linux). */
#define C_DIRECTLPT 1

6
vs2015/dosbox-x.sln
View File

@ -156,21 +156,15 @@ Global
{76B22E87-5DD6-4829-BBF0-1DC8025BB87C}.Release|Win32.ActiveCfg = Release SDL2|Win32
{76B22E87-5DD6-4829-BBF0-1DC8025BB87C}.Release|x64.ActiveCfg = Release SDL2|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug SDL2|Win32.ActiveCfg = Debug|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug SDL2|Win32.Build.0 = Debug|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug SDL2|x64.ActiveCfg = Debug|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug SDL2|x64.Build.0 = Debug|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug|Win32.ActiveCfg = Debug|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug|Win32.Build.0 = Debug|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug|x64.ActiveCfg = Debug|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Debug|x64.Build.0 = Debug|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release SDL2|Win32.ActiveCfg = Release|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release SDL2|Win32.Build.0 = Release|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release SDL2|x64.ActiveCfg = Release|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release SDL2|x64.Build.0 = Release|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release|Win32.ActiveCfg = Release|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release|Win32.Build.0 = Release|Win32
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release|x64.ActiveCfg = Release|x64
{671232EC-C55C-4636-A75F-7E4B4C54C314}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE