Merge branch 'main' into 12.x

CMakeLists.txt

@@ -198,7 +198,7 @@ endif()
 
 set(MEGA_ZLIB_VER "1.2.12")
 set(MEGA_LUA51_VER "5.1.5")
-set(MEGA_LUAJIT_VER "2.1.0-7a0cf5f")
+set(MEGA_LUAJIT_VER "2.1.0-1c27912")
 set(MEGA_LIBOGG_VER "1.3.2")
 set(MEGA_LIBVORBIS_VER "1.3.5")
 set(MEGA_LIBTHEORA_VER "1.1.1")

readme.md

@@ -2,34 +2,46 @@ Megasource is a CMake-buildable collection of all [LÖVE][love2d] dependencies.
 
 It is currently only officially supported on Windows, but may also work on macOS. It could certainly also work on Linux, but good package managers makes megasource less relevant there.
 
+Versions
+--------
+
+This repository uses git tags for the library dependencies of a specific released version of LÖVE.
+
+For in-development versions of LÖVE, there may be a branch in this repository corresponding to a similar branch in the love repository.
+
 Prerequisites
 -------------
 
  - Windows.
- - [Visual Studio 2019][vs2019] or greater.
+ - LOVE 12+: [Visual Studio 2019][vs2019] or newer.
+ - LOVE 11 and older: [Visual Studio 2013][oldvs] or newer. Official builds of LOVE 11 and older use Visual Studio 2013.
  - [CMake 3.1][cmake] or greater.
  - [NSIS][nsis] if you want to build the LÖVE installer.
 
 Building
 --------
 
-To build just the dependencies:
+To build just the dependencies for 64 bit x86 using Visual Studio 2019:
 
 	$ git clone https://github.com/love2d/megasource megasource
 	$ cd megasource
-	$ cmake -H. -Bbuild
+	$ cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
 	$ cmake --build build --target megatest --config Release
 
 ... or you can open the solution file in Visual Studio and build from there instead of invoking cmake --build.
 
-Note, that ```-H``` had been replaced in CMake 3.13 with ```-S```.
+To build for a different version of Visual Studio (or a different build tool), replace ```"Visual Studio 16 2019"``` with one of the other [build system generators][generators]. For example Visual Studio 2022 is ```"Visual Studio 17 2022"```.
+
+Similarly, to build for a different architecture than 64 bit x86, use a different [architecture name][architectures] for the ```-A``` parameter.
+
+Note that ```-H``` has been replaced in CMake 3.13 with ```-S```.
 
 If you want to build [LÖVE][love2d], clone LÖVE into the *libs* folder. Megasource will automatically look for it there. E.g.:
 
 	$ git clone https://github.com/love2d/megasource megasource
 	$ cd megasource
 	$ git clone https://github.com/love2d/love libs/love
-	$ cmake -H. -Bbuild
+	$ cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
 	$ cmake --build build --target love/love --config Release
 
 The binaries can be found in *build/love/Release*.
@@ -44,3 +56,6 @@ A zip with the binaries and the installer will appear in *build*.
 [cmake]: http://www.cmake.org/
 [nsis]: http://nsis.sourceforge.net
 [vs2019]: https://visualstudio.microsoft.com/downloads/
+[oldvs]: https://visualstudio.microsoft.com/vs/older-downloads/
+[generators]: https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators
+[architectures]: https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2016%202019.html#platform-selection