Commit f6b9516f authored by Ben Avison's avatar Ben Avison
Browse files

Build fix

Detail:
  The build utility MkTables.maketables, compiled at build time, is 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.
Admin:
  Tested using an APCS-R build on an Iyonix.

Version 1.76. Not tagged
parent 987b87ce
......@@ -63,18 +63,17 @@ resources-colourtrans: Palettes.8desktop
${CP} Tables ${RESFSDIR}.* ${CPFLAGS}
@echo ${COMPONENT}: extra resource files copied
MkTables.o.maketables: MkTables.c.maketables
${CC} $(ccflags) -c -o $@ MkTables.c.maketables
MkTables.maketables: MkTables.o.maketables ${CLIB} MkTables.o._dirs
link $(linkflags) -o $@ MkTables.o.maketables ${CLIB}
MkTables.maketables: MkTables.c.maketables
${CD} MkTables
${MAKE} -f maketables/mk COMPONENT=maketables THROWBACK=${THROWBACK}
${CD} ^
Palettes.8desktop: MkTables.maketables ${ROM_MODULE}
ifthere ${ROM_MODULE} then rmload ${ROM_MODULE} else rmload rm.${TARGET}
MkTables.maketables @
${RUN}MkTables.maketables @
settype Tables.8greys text
settype Tables.4greys text
MkTables.dosqueeze
${RUN}MkTables.dosqueeze
MkTables.o._dirs:
${MKDIR} MkTables.o
......
......@@ -15,3 +15,4 @@
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
stripdepnd MkTables.maketables/mk
\ No newline at end of file
# 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 maketables
include HostTools
include StdRules
include AppLibs
include CApp
# Dynamic dependencies:
......@@ -14,10 +14,10 @@
Module_MajorVersion SETS "1.76"
Module_Version SETA 176
Module_MinorVersion SETS ""
Module_Date SETS "11 Jun 2009"
Module_ApplicationDate SETS "11-Jun-09"
Module_Date SETS "13 Jun 2009"
Module_ApplicationDate SETS "13-Jun-09"
Module_ComponentName SETS "Colours"
Module_ComponentPath SETS "castle/RiscOS/Sources/Video/Render/Colours"
Module_FullVersion SETS "1.76"
Module_HelpVersion SETS "1.76 (11 Jun 2009)"
Module_HelpVersion SETS "1.76 (13 Jun 2009)"
END
......@@ -6,18 +6,18 @@
*/
#define Module_MajorVersion_CMHG 1.76
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 11 Jun 2009
#define Module_Date_CMHG 13 Jun 2009
#define Module_MajorVersion "1.76"
#define Module_Version 176
#define Module_MinorVersion ""
#define Module_Date "11 Jun 2009"
#define Module_Date "13 Jun 2009"
#define Module_ApplicationDate "11-Jun-09"
#define Module_ApplicationDate "13-Jun-09"
#define Module_ComponentName "Colours"
#define Module_ComponentPath "castle/RiscOS/Sources/Video/Render/Colours"
#define Module_FullVersion "1.76"
#define Module_HelpVersion "1.76 (11 Jun 2009)"
#define Module_HelpVersion "1.76 (13 Jun 2009)"
#define Module_LibraryVersionInfo "1:76"
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