# HG changeset patch # User Tormod Volden # Date 1373476634 -7200 # Node ID ca65720ee3735993c50773812e257cfae5bf20aa # Parent 0f3030598435f5b3b641fb1aa47e55a534c1fad1 Fix support for 50Hz setting The settings in the defs file (symbol SET value) will overrule any symbol set on the lwasm command line (-Dsymbol=value) in the makefile. We will therefore need to guard any settings in the defs file that we possibly want to predefine. diff -r 0f3030598435 -r ca65720ee373 defs/atari.d --- a/defs/atari.d Wed Jul 10 19:09:05 2013 +0200 +++ b/defs/atari.d Wed Jul 10 19:17:14 2013 +0200 @@ -66,17 +66,21 @@ * Hz50 equ 1 Assemble clock for 50 hz power Hz60 equ 2 Assemble clock for 60 hz power + IFNDEF PwrLnFrq PwrLnFrq set Hz60 Set to Appropriate freq + ENDC ********************************** * Ticks per second * + IFNDEF TkPerSec ifeq PwrLnFrq-Hz50 TkPerSec set 50 else TkPerSec set 60 endc + ENDC ************************************************* diff -r 0f3030598435 -r ca65720ee373 defs/coco.d --- a/defs/coco.d Wed Jul 10 19:09:05 2013 +0200 +++ b/defs/coco.d Wed Jul 10 19:17:14 2013 +0200 @@ -77,17 +77,21 @@ * Hz50 EQU 1 Assemble clock for 50 hz power Hz60 EQU 2 Assemble clock for 60 hz power + IFNDEF PwrLnFrq PwrLnFrq SET Hz60 Set to Appropriate freq + ENDC ********************************** * Ticks per second * + IFNDEF TkPerSec IFEQ PwrLnFrq-Hz50 TkPerSec SET 50 ELSE TkPerSec SET 60 ENDC + ENDC ****************** diff -r 0f3030598435 -r ca65720ee373 defs/dragon.d --- a/defs/dragon.d Wed Jul 10 19:09:05 2013 +0200 +++ b/defs/dragon.d Wed Jul 10 19:17:14 2013 +0200 @@ -36,17 +36,21 @@ * Hz50 EQU 1 Assemble clock for 50 hz power Hz60 EQU 2 Assemble clock for 60 hz power + IFNDEF PwrLnFrq PwrLnFrq SET Hz60 Set to Appropriate freq + ENDC ********************************** * Ticks per second * + IFNDEF TkPerSec IFEQ PwrLnFrq-Hz50 TkPerSec SET 50 ELSE TkPerSec SET 60 ENDC + ENDC ****************************************