• R/O
  • SSH
  • HTTPS

oricsdk: Commit


Commit MetaInfo

Revision1573 (tree)
Time2021-10-05 02:35:18
Authordbug

Log Message

Modified OSDKXAPARAMS to default to -C -W if not set by the user, this makes it possible to use the 65C02 and 65816 opcodes if the user wishes (useful for the CPU test program)

Change Summary

Incremental Difference

--- public/pc/tools/osdk/main/Osdk/_final_/Bin/make.bat (revision 1572)
+++ public/pc/tools/osdk/main/Osdk/_final_/Bin/make.bat (revision 1573)
@@ -9,7 +9,7 @@
99 :: - OSDKADDR - Start address of the program (defaults to $600 if not defined)
1010 :: - OSDKCOMP - Can be used to override compiler flags such as optimization level (default to "-O2" if not defined)
1111 :: - OSDKCPPFLAGS - To pass additional data to the C preprocessor (Currently LCC65)
12-:: - OSDKXAPARAMS - To pass additional data to the 6502 assembler (Currently XA)
12+:: - OSDKXAPARAMS - To pass additional data to the 6502 assembler (Currently XA and defaults to "-C -W" if not defined)
1313 :: - OSDKTAPNAME - Name of the TAP file (defaults to "OSDK" if not defined)
1414 :: - OSDKDISK - Name of the DSK file, if undefined, the DSK generation is skipped
1515 :: - OSDKINIST - Sedoric initialization string ran on floppy boot
@@ -65,7 +65,15 @@
6565 SET OSDKCOMP=-O2
6666 :Comp
6767
68+::
69+:: Set XA to disable 65C02 and 65816 instructions by default
70+:: if the user did not specify anything else
71+::
72+IF NOT "%OSDKXAPARAMS%"=="" GOTO EndXaParams
73+SET OSDKXAPARAMS=-W -C
74+:EndXaParams
6875
76+
6977 ::
7078 :: Set the default path to the Oric Libraries
7179 :: if no user defined OSDKLIB was found
@@ -279,7 +287,7 @@
279287 :: (-W -C are meant to disallow the 65816 and 65c02 instructions)
280288 ::%OSDKB%\xa.exe %OSDKT%\linked.s -o final.out -e xaerr.txt -l xalbl.txt
281289 ECHO Assembling
282-%OSDKB%\xa.exe -W -C %OSDKT%\linked.s -o build\final.out -e build\xaerr.txt -l build\symbols -bt %OSDKADDR% -DASSEMBLER=XA %OSDKXAPARAMS% -DOSDKNAME_%OSDKNAME%
290+%OSDKB%\xa.exe %OSDKT%\linked.s -o build\final.out -e build\xaerr.txt -l build\symbols -bt %OSDKADDR% -DASSEMBLER=XA %OSDKXAPARAMS% -DOSDKNAME_%OSDKNAME%
283291 IF NOT EXIST "build\final.out" GOTO ErFailure
284292
285293
Show on old repository browser