From aa9e03506ba73f1df3db477770436f0348ef3dd1 Mon Sep 17 00:00:00 2001 From: nightmareci Date: Mon, 13 Feb 2023 09:35:28 -0800 Subject: [PATCH] Create unified batch file for running the game from the source directory on Windows and update README.md --- README.md | 10 +++++----- start.bat | 7 +++++++ start_win32.bat | 1 - start_win64.bat | 1 - 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 start.bat delete mode 100644 start_win32.bat delete mode 100644 start_win64.bat diff --git a/README.md b/README.md index 4305da6..02abf98 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Cambridge Welcome to Cambridge, the next open-source falling-block game engine! -The project is written and maintained exclusively by [Milla](https://github.com/MillaBasset), [joezeng](https://github.com/joezeng) and [Oshisaure](https://github.com/oshisaure)! +The project is written and maintained exclusively by [Milla](https://github.com/MillaBasset), [joezeng](https://github.com/joezeng) and [Oshisaure](https://github.com/oshisaure)! The Discord server has been reopened! https://discord.gg/AADZUmgsph @@ -16,11 +16,11 @@ Playing the game ### Windows -You do not need LÖVE on Windows, as it comes bundled with the program. +You do not need LÖVE on Windows, as it comes bundled with the program. #### Stable release -To get the stable release, simply download either `cambridge-win32.zip` (32-bit) or `cambridge-windows.zip` (64-bit) in the [latest release](https://github.com/MillaBasset/cambridge/releases/latest). +To get the stable release, simply download either `cambridge-win32.zip` (32-bit) or `cambridge-windows.zip` (64-bit) in the [latest release](https://github.com/MillaBasset/cambridge/releases/latest). All assets needed are bundled with the executable. @@ -28,11 +28,11 @@ All assets needed are bundled with the executable. If you want the bleeding edge version, download [this](https://github.com/MillaBasset/cambridge/archive/master.zip). Extract the ZIP to a folder of your choosing. -Assuming you're on a 64-bit system, you can double-click `start_win64.bat` to run the game. If that doesn't work, open a Command Prompt where you extracted Cambridge and run: +If you're on Windows, you can double-click `start.bat` to run the game. If that doesn't work, open a Command Prompt where you extracted Cambridge and run: dist\windows\love.exe . -If you're on a 32-bit system, you'll want to double-click `start_win32.bat`. If that doesn't work, run this instead: +If that doesn't work, run this instead, still using Command Prompt where you extracted Cambridge: dist\win32\love.exe . diff --git a/start.bat b/start.bat new file mode 100644 index 0000000..aa7685b --- /dev/null +++ b/start.bat @@ -0,0 +1,7 @@ +@echo OFF + +rem This solution of detecting the current CPU taken from here: https://stackoverflow.com/a/24590583 +reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set CURRENT_CPU=32BIT || set CURRENT_CPU=64BIT + +if %CURRENT_CPU%==32BIT .\dist\win32\love.exe . +if %CURRENT_CPU%==64BIT .\dist\windows\love.exe . \ No newline at end of file diff --git a/start_win32.bat b/start_win32.bat deleted file mode 100644 index 5d2ac86..0000000 --- a/start_win32.bat +++ /dev/null @@ -1 +0,0 @@ -dist\win32\love.exe . \ No newline at end of file diff --git a/start_win64.bat b/start_win64.bat deleted file mode 100644 index acdd477..0000000 --- a/start_win64.bat +++ /dev/null @@ -1 +0,0 @@ -dist\windows\love.exe . \ No newline at end of file