From 3a68b17c909ff4890d54f41bad837a3bc57f84c9 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Sat, 13 Jun 2009 23:26:22 +0000
Subject: [PATCH] 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
---
Makefile | 20 +++++++++-----------
Mk,fd7 | 2 +-
MkClean,fd7 | 1 +
VersionASM | 6 +++---
VersionNum | 8 ++++----
util.mk | 26 ++++++++++++++++++++++++++
6 files changed, 44 insertions(+), 19 deletions(-)
create mode 100644 util.mk
diff --git a/Makefile b/Makefile
index 8bafe7b..11da7c4 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 d4d7c5b..100a76d 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 769a51f..9365783 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 633d939..3b030ee 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 5e50593..80c0bd0 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 0000000..6c79de8
--- /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:
--
GitLab