diff --git a/.gitignore b/.gitignore index 2e60c5da6..7258b0a6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,8 @@ -*.suo -*.user -*.VC.db -*.VC.VC.opendb -*.sdf -bin/ -bin/* -obj/ -obj/* +############################################################################### +# dosbox-x +############################################################################### + *~ -*.o -*.a -*.la dosbox.app/ dosbox.app/* dosbox.icns @@ -19,4 +11,314 @@ dosbox.iconset/* autom4te.cache/ autom4te.cache/* .DS_Store +windows-installer/DOSBox-X-standalone-* windows-installer/DOSBox-X-setup-*.exe +windows-installer/DOSBox-X-setup-*.zip + +*.o +*.a +*.la + +############################################################################### +# Visual Studio +############################################################################### + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs diff --git a/README.SDL2.MIGRATION.MD b/README.SDL2.MIGRATION.MD new file mode 100644 index 000000000..6233eb3c9 --- /dev/null +++ b/README.SDL2.MIGRATION.MD @@ -0,0 +1,7 @@ +# Instructions for using SDL2 +- Clone https://github.com/aybe/SDL-mirror repository +- Switch to the branch ```release-2.0.5-dosbox-x``` +- Build solutions for ```x86``` and ```x64``` in ```vs2017``` folder + +# Notes +Assuming that ```dosbox-x``` and ```SDL-mirror``` are in the same parent folder, e.g. c:\username\documents\GitHub, otherwise you'll have to update your VC++ directories. \ No newline at end of file diff --git a/vs2015/dosbox-x.vcxproj b/vs2015/dosbox-x.vcxproj index 66eac7fd8..fe8ad788d 100644 --- a/vs2015/dosbox-x.vcxproj +++ b/vs2015/dosbox-x.vcxproj @@ -70,21 +70,29 @@ $(SolutionDir)..\bin\$(Platform)\$(Configuration)\ $(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)..\..\SDL-mirror\include;$(IncludePath) + $(SolutionDir)..\..\SDL-mirror\vs2017\x86\Release;$(LibraryPath) $(SolutionDir)..\bin\$(Platform)\$(Configuration)\ $(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(SolutionDir)..\..\SDL-mirror\include;$(IncludePath) + $(SolutionDir)..\..\SDL-mirror\vs2017\x64\Release;$(LibraryPath) $(SolutionDir)..\bin\$(Platform)\$(Configuration)\ $(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(SolutionDir)..\..\SDL-mirror\include;$(IncludePath) + $(SolutionDir)..\..\SDL-mirror\vs2017\x86\Release;$(LibraryPath) $(SolutionDir)..\bin\$(Platform)\$(Configuration)\ $(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(SolutionDir)..\..\SDL-mirror\include;$(IncludePath) + $(SolutionDir)..\..\SDL-mirror\vs2017\x64\Release;$(LibraryPath)