From 42f3f808e3147a8b67d5d65fcc197c6fa8e81b46 Mon Sep 17 00:00:00 2001 From: pommicket Date: Thu, 14 Sep 2023 11:10:36 -0400 Subject: build ted.msi in make.bat --- README.md | 9 ++++----- development.md | 1 - make.bat | 6 +++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5a0b12d..24998c8 100644 --- a/README.md +++ b/README.md @@ -273,16 +273,15 @@ sudo apt install clang libsdl2-dev cmake imagemagick Then run `make -j8 release` to build or `sudo make install -j8` to build and install. You can also run `make -j8 ted.deb` to build the .deb installer. -On Windows (64-bit), you will need to install Microsoft Visual Studio, then find and add vcvarsall.bat to your PATH. +On Windows, install Microsoft Visual Studio 2022, then find and add vcvarsall.bat to your PATH +(most likely lives at `C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build`). +Also, install the [Visual Studio Installer Projects extension](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects) +(needed to build the .msi installer). Next you will need the SDL2 VC development libraries: https://www.libsdl.org/download-2.0.php Extract the zip, copy SDL2-2.x.y into the ted directory, and rename it to SDL2. Also copy SDL2\\lib\\x64\\SDL2.dll to the ted directory. Then run `make.bat release`. -To build the .msi file, you will need Visual Studio 2022, as well as the -[Visual Studio Installer Projects extension](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects). -Then, open windows\_installer\\ted.sln, and build. - ## Version history diff --git a/development.md b/development.md index ab5a369..f1a5707 100644 --- a/development.md +++ b/development.md @@ -144,5 +144,4 @@ When releasing a new version of `ted`: - Run `make ted.deb` on Debian/Ubuntu. - Run `make.bat release` on Windows. - Run `python3 update-windows-installer.py`. -- Build `ted.msi`. - Create a new release on GitHub with `ted.deb` and `ted.msi`. diff --git a/make.bat b/make.bat index 806d5d0..52ade8d 100644 --- a/make.bat +++ b/make.bat @@ -21,6 +21,10 @@ if _%1 == _ ( copy /y ted.exe .. popd ) -if _%1 == _release cl main.c ted.res /O2 /wd4702 %C_FLAGS% /Fe:ted +if _%1 == _release ( + cl main.c ted.res /O2 /wd4702 %C_FLAGS% /Fe:ted + devenv windows_installer\ted\ted.vdproj /build "Release|Default" + copy /y windows_installer\ted\Release\ted.msi +) if _%1 == _release_with_debug_info cl main.c ted.res /DEBUG /Zi /O2 /wd4702 %C_FLAGS% /Fe:ted if _%1 == _profile cl main.c ted.res /O2 /wd4702 /DPROFILE %C_FLAGS% /Fe:ted -- cgit v1.2.3