Commit 3a68b17c authored by Ben Avison's avatar Ben Avison
Browse files

Build fix

Detail:
  The build utilities utils.makejhdr, utils.genpalette and utils.genyuvtabs,
  compiled at build time, are now built using the HostTools shared makefile,
  and so will execute on any RISC OS build host even if the default compiler
  options are to target an incompatible ARM architecture. Also now sets the
  throwback flag when doing builds via the Mk obey file.
Admin:
  Tested using an APCS-R build on an Iyonix.

Version 1.20. Not tagged
No related merge requests found
...@@ -38,8 +38,6 @@ EXP_HDR = <export$dir> ...@@ -38,8 +38,6 @@ EXP_HDR = <export$dir>
# change the #define of DEBUG at the top of c.PutScaled # change the #define of DEBUG at the top of c.PutScaled
# change the SETL of 'debug' in sources.SprExtend. # change the SETL of 'debug' in sources.SprExtend.
ASFLAGS = -APCS 3/32bit/nofp -cpu 4
TFLAGS = -APCS 3/32bit/nofp
CDEFINES = -DRISCOS -DASMHUFF CDEFINES = -DRISCOS -DASMHUFF
#CDEFINES += -DDEBUG #CDEFINES += -DDEBUG
CINCLUDES = -IC: CINCLUDES = -IC:
...@@ -160,22 +158,22 @@ ${EXP_HDR}.SprExtend: hdr.SprExtend ...@@ -160,22 +158,22 @@ ${EXP_HDR}.SprExtend: hdr.SprExtend
${CP} s.temp s.$* ${CPFLAGS}d ${CP} s.temp s.$* ${CPFLAGS}d
s.yuvtabs: ${GENYUVTABS} s.yuvtabs: ${GENYUVTABS}
${GENYUVTABS} > $@ ${RUN}${GENYUVTABS} > $@
s.stdpalette: ${GENPALETTE} s.stdpalette: ${GENPALETTE}
${GENPALETTE} > $@ ${RUN}${GENPALETTE} > $@
s.jhdr: ${MAKEJHDR} s.jhdr: ${MAKEJHDR}
${MAKEJHDR} > $@ ${RUN}${MAKEJHDR} > $@
${GENPALETTE}: oh.genpalette ${CLIB} ${GENPALETTE}: c.genpalette
${LD} -o $@ oh.genpalette ${CLIB} ${MAKE} -f util/mk COMPONENT=genpalette THROWBACK=${THROWBACK}
${GENYUVTABS}: oh.genyuvtabs ${CLIB} ${GENYUVTABS}: c.genyuvtabs
${LD} -o $@ oh.genyuvtabs ${CLIB} ${MAKE} -f util/mk COMPONENT=genyuvtabs THROWBACK=${THROWBACK}
${MAKEJHDR}: oh.makejhdr ${CLIB} ${MAKEJHDR}: c.makejhdr
${LD} -o $@ oh.makejhdr ${CLIB} ${MAKE} -f util/mk COMPONENT=makejhdr THROWBACK=${THROWBACK}
# #
# For ChangeFSI: # For ChangeFSI:
# #
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
| limitations under the License. | limitations under the License.
| |
Dir <Obey$Dir> Dir <Obey$Dir>
amu_machine all amu_machine all THROWBACK=-throwback
...@@ -15,3 +15,4 @@ ...@@ -15,3 +15,4 @@
Dir <Obey$Dir> Dir <Obey$Dir>
amu_machine clean amu_machine clean
stripdepnd Makefile stripdepnd Makefile
stripdepnd util/mk
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
Module_MajorVersion SETS "1.20" Module_MajorVersion SETS "1.20"
Module_Version SETA 120 Module_Version SETA 120
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "11 Jun 2009" Module_Date SETS "14 Jun 2009"
Module_ApplicationDate SETS "11-Jun-09" Module_ApplicationDate SETS "14-Jun-09"
Module_ComponentName SETS "SprExtend" Module_ComponentName SETS "SprExtend"
Module_ComponentPath SETS "mixed/RiscOS/Sources/Video/Render/SprExtend" Module_ComponentPath SETS "mixed/RiscOS/Sources/Video/Render/SprExtend"
Module_FullVersion SETS "1.20" Module_FullVersion SETS "1.20"
Module_HelpVersion SETS "1.20 (11 Jun 2009)" Module_HelpVersion SETS "1.20 (14 Jun 2009)"
END END
...@@ -6,18 +6,18 @@ ...@@ -6,18 +6,18 @@
*/ */
#define Module_MajorVersion_CMHG 1.20 #define Module_MajorVersion_CMHG 1.20
#define Module_MinorVersion_CMHG #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_MajorVersion "1.20"
#define Module_Version 120 #define Module_Version 120
#define Module_MinorVersion "" #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_ComponentName "SprExtend"
#define Module_ComponentPath "mixed/RiscOS/Sources/Video/Render/SprExtend" #define Module_ComponentPath "mixed/RiscOS/Sources/Video/Render/SprExtend"
#define Module_FullVersion "1.20" #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" #define Module_LibraryVersionInfo "1:20"
# 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:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment