Skip to content

Commit 79849a6

Browse files
committed
Fix Windows build to support multiple build parameters
1 parent 9003eb5 commit 79849a6

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

2-build-files/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This folder contains support scripts for building Elite-A.
66

77
* [elite-checksum.py](elite-checksum.py) adds checksums to the assembled output
88

9+
It also contains the `make.exe` executable for Windows, plus the required DLL files.
10+
911
---
1012

1113
Right on, Commanders!
File renamed without changes.
File renamed without changes.

make.exe 2-build-files/make.exe

File renamed without changes.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Note that the build ends with a warning that there is no `SAVE` command in the s
161161

162162
### Windows
163163

164-
For Windows users, there is a batch file called `make.bat` to which you can pass one of the build targets above. Before this will work, you should edit the batch file and change the values of the `BEEBASM` and `PYTHON` variables to point to the locations of your `beebasm.exe` and `python.exe` executables. You also need to change directory to the repository folder (i.e. the same folder as `make.exe`).
164+
For Windows users, there is a batch file called `make.bat` to which you can pass one of the build targets above. Before this will work, you should edit the batch file and change the values of the `BEEBASM` and `PYTHON` variables to point to the locations of your `beebasm.exe` and `python.exe` executables. You also need to change directory to the repository folder (i.e. the same folder as `make.bat`).
165165

166166
All being well, doing one of the following:
167167

make.bat

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
@echo off
22
SETLOCAL
3-
SET BEEBASM=..\..\bin\beebasm.exe
4-
SET PYTHON=C:\Home\Python27\python.exe
5-
make %1
6-
if [%2]==[] goto skip
7-
make %2
8-
:skip
3+
SET BEEBASM=C:\Users\user\bin\beebasm.exe
4+
SET PYTHON=C:\Users\user\AppData\Local\Microsoft\WindowsApps\python.exe
5+
2-build-files\make %*

0 commit comments

Comments
 (0)