diff --git a/.github/workflows/dormant/windows.yml b/.github/workflows/dormant/windows.yml index 3b74cc43..c60f34be 100644 --- a/.github/workflows/dormant/windows.yml +++ b/.github/workflows/dormant/windows.yml @@ -30,14 +30,14 @@ jobs: env: PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64' run: | - cd visualc_net + cd vs MSBuild -m dosbox.sln -p:Configuration=Release - name: Debug build shell: pwsh env: PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64' run: | - cd visualc_net + cd vs MSBuild -m dosbox.sln -p:Configuration=Debug diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b92b1c99..b42760a1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -29,7 +29,7 @@ jobs: env: PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64' run: | - cd visualc_net + cd vs MSBuild -m dosbox.sln -p:Configuration=${{ matrix.type }} diff --git a/Makefile.am b/Makefile.am index b8408129..fb337ed5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Main Makefile for DOSBox EXTRA_DIST = autogen.sh -SUBDIRS = src include docs visualc_net +SUBDIRS = src include docs vs # Per the auto-tools clean guidelines: # https://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/Clean.html#Clean diff --git a/README.md b/README.md index e6fc3b77..50644fb6 100644 --- a/README.md +++ b/README.md @@ -104,8 +104,8 @@ PowerShell, and run: These two steps will ensure that MSVC finds and links all dependencies. -Start Visual Studio, open file: `visualc_net\dosbox.sln` and build all -projects (Ctrl+Shift+B). +Start Visual Studio, open file: `vs\dosbox.sln` and build all projects +(Ctrl+Shift+B). ## Interop with SVN diff --git a/configure.ac b/configure.ac index e291acf8..06fe76b2 100644 --- a/configure.ac +++ b/configure.ac @@ -646,7 +646,7 @@ src/misc/Makefile src/shell/Makefile src/platform/Makefile src/platform/visualc/Makefile -visualc_net/Makefile +vs/Makefile include/Makefile docs/Makefile ]) diff --git a/visualc_net/.gitignore b/vs/.gitignore similarity index 100% rename from visualc_net/.gitignore rename to vs/.gitignore diff --git a/visualc_net/Makefile.am b/vs/Makefile.am similarity index 100% rename from visualc_net/Makefile.am rename to vs/Makefile.am diff --git a/visualc_net/dosbox.sln b/vs/dosbox.sln similarity index 100% rename from visualc_net/dosbox.sln rename to vs/dosbox.sln diff --git a/visualc_net/dosbox.vcxproj b/vs/dosbox.vcxproj similarity index 100% rename from visualc_net/dosbox.vcxproj rename to vs/dosbox.vcxproj