diff --git a/Makefile b/Makefile index 8bafe7bed90b80eb68423daa1d14bf5572463c0e..11da7c4be0759a8a9a9323654fb00a0d03ba44db 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,6 @@ EXP_HDR = <export$dir> # change the #define of DEBUG at the top of c.PutScaled # change the SETL of 'debug' in sources.SprExtend. -ASFLAGS = -APCS 3/32bit/nofp -cpu 4 -TFLAGS = -APCS 3/32bit/nofp CDEFINES = -DRISCOS -DASMHUFF #CDEFINES += -DDEBUG CINCLUDES = -IC: @@ -160,22 +158,22 @@ ${EXP_HDR}.SprExtend: hdr.SprExtend ${CP} s.temp s.$* ${CPFLAGS}d s.yuvtabs: ${GENYUVTABS} - ${GENYUVTABS} > $@ + ${RUN}${GENYUVTABS} > $@ s.stdpalette: ${GENPALETTE} - ${GENPALETTE} > $@ + ${RUN}${GENPALETTE} > $@ s.jhdr: ${MAKEJHDR} - ${MAKEJHDR} > $@ + ${RUN}${MAKEJHDR} > $@ -${GENPALETTE}: oh.genpalette ${CLIB} - ${LD} -o $@ oh.genpalette ${CLIB} +${GENPALETTE}: c.genpalette + ${MAKE} -f util/mk COMPONENT=genpalette THROWBACK=${THROWBACK} -${GENYUVTABS}: oh.genyuvtabs ${CLIB} - ${LD} -o $@ oh.genyuvtabs ${CLIB} +${GENYUVTABS}: c.genyuvtabs + ${MAKE} -f util/mk COMPONENT=genyuvtabs THROWBACK=${THROWBACK} -${MAKEJHDR}: oh.makejhdr ${CLIB} - ${LD} -o $@ oh.makejhdr ${CLIB} +${MAKEJHDR}: c.makejhdr + ${MAKE} -f util/mk COMPONENT=makejhdr THROWBACK=${THROWBACK} # # For ChangeFSI: # diff --git a/Mk,fd7 b/Mk,fd7 index d4d7c5bc9097afdca2e4327b4570e783ddc42518..100a76da028382b77a9367d49bccbf85238cd101 100644 --- a/Mk,fd7 +++ b/Mk,fd7 @@ -13,4 +13,4 @@ | limitations under the License. | Dir <Obey$Dir> -amu_machine all +amu_machine all THROWBACK=-throwback diff --git a/MkClean,fd7 b/MkClean,fd7 index 769a51fc81bc99dc8f5ddcb00bdba8b9da3e83b2..93657831e4b157f97b216b105366cb8c85fc08af 100644 --- a/MkClean,fd7 +++ b/MkClean,fd7 @@ -15,3 +15,4 @@ Dir <Obey$Dir> amu_machine clean stripdepnd Makefile +stripdepnd util/mk diff --git a/VersionASM b/VersionASM index 633d939a9af7f2ed58e53390849581bebd5815d1..3b030eee624b11ef442eb190fedde29f0a05a0b1 100644 --- a/VersionASM +++ b/VersionASM @@ -14,10 +14,10 @@ Module_MajorVersion SETS "1.20" Module_Version SETA 120 Module_MinorVersion SETS "" -Module_Date SETS "11 Jun 2009" -Module_ApplicationDate SETS "11-Jun-09" +Module_Date SETS "14 Jun 2009" +Module_ApplicationDate SETS "14-Jun-09" Module_ComponentName SETS "SprExtend" Module_ComponentPath SETS "mixed/RiscOS/Sources/Video/Render/SprExtend" Module_FullVersion SETS "1.20" -Module_HelpVersion SETS "1.20 (11 Jun 2009)" +Module_HelpVersion SETS "1.20 (14 Jun 2009)" END diff --git a/VersionNum b/VersionNum index 5e50593c8bf5391ecaaed486b19defd28d6ce4fd..80c0bd0a018796d2a6f4025faa43eabc104e5538 100644 --- a/VersionNum +++ b/VersionNum @@ -6,18 +6,18 @@ */ #define Module_MajorVersion_CMHG 1.20 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 11 Jun 2009 +#define Module_Date_CMHG 14 Jun 2009 #define Module_MajorVersion "1.20" #define Module_Version 120 #define Module_MinorVersion "" -#define Module_Date "11 Jun 2009" +#define Module_Date "14 Jun 2009" -#define Module_ApplicationDate "11-Jun-09" +#define Module_ApplicationDate "14-Jun-09" #define Module_ComponentName "SprExtend" #define Module_ComponentPath "mixed/RiscOS/Sources/Video/Render/SprExtend" #define Module_FullVersion "1.20" -#define Module_HelpVersion "1.20 (11 Jun 2009)" +#define Module_HelpVersion "1.20 (14 Jun 2009)" #define Module_LibraryVersionInfo "1:20" diff --git a/util.mk b/util.mk new file mode 100644 index 0000000000000000000000000000000000000000..6c79de8fa143541c000f471940f0c443bc1852df --- /dev/null +++ b/util.mk @@ -0,0 +1,26 @@ +# Copyright 2009 Castle Technology Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Makefile for genpalette, genyuvtabs and makejhdr + +TARGET = utils.${COMPONENT} +OBJS = ${COMPONENT} +CDEFINES = -DRISCOS -DASMHUFF + +include HostTools +include StdRules +include AppLibs +include CApp + +# Dynamic dependencies: