Skip to content

GitLab

Commit 6540feac authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Add option to install disc sprites as a seperate target 

Also make use of (some) shared makefiles.

Version 2.11. Tagged as 'Paint-2_11'
parent 129e5e5a
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 65 deletions
Makefile
View file @ 6540feac
......@@ -41,42 +41,19 @@ MSGS = Resources.GenMessage
RESDIR = <resource$dir>.Resources.${COMPONENT}
RESAPP = <resource$dir>.Apps.${APP}
#
# Generic options:
#
MKDIR = do mkdir -p
AS = objasm
CC = cc
CMHG = cmhg
CP = copy
LD = link
RM = remove
SQUEEZE = squeeze
WIPE = x wipe
XWIPE = x wipe
AWK = GNU.gawk
AFLAGS = ${THROWBACK} -depend !Depend -nocache -stamp -quit
CFLAGS = ${THROWBACK} -c -depend !Depend -fah ${INCLUDES} -wp
CPFLAGS = ~cfr~v
SQFLAGS =
WFLAGS = ~c~vf
include StdTools
include ModuleLibs
#
# Libraries
#
ANSILIB = CLib:o.ansilib
CLIB = CLIB:o.stubs
RLIB = RISC_OSLib:o.risc_oslib
ROMSTUBS = RISC_OSLib:o.romstubs
ABSSYM = RISC_OSLib:o.abssym
SQZFLAGS = -f
CINCLUDES = -IC:
ASFLAGS = ${STDTOOLOPTIONS} -nocache -stamp -quit
CFLAGS = ${STDTOOLOPTIONS} ${C_WARNINGS} ${CINCLUDES} -wp
WRAPPER = RISC_OSLib:s.ModuleWrap
LIBSD = ${RLIB} ${CLIB}
#
# Include files
# Include files:
#
INCLUDES = -IC:
FILES = \
${RDIR}.!Boot\
${LDIR}.!Help\
......@@ -95,7 +72,6 @@ FILESD = \
${LDIR}.Templates\
abs.!RunImageD
# Include these in the ROM module
RESFILES =
DFILES = \
......@@ -120,23 +96,29 @@ INCS = i.colours i.main i.menus i.psprite i.sprwindow i.tools i.toolwindow
#
# Rule patterns
#
.SUFFIXES: .oz .od .i .asm
.c.o:; ${CC} ${CFLAGS} -ff -o $@ $<
.c.oz:; ${CC} ${CFLAGS} -ff -zM -zps1 -o $@ $<
.c.od:; ${CC} ${CFLAGS} -DTRACE=1 -o $@ $<
.asm.o:; ${AS} ${AFLAGS} $< $@
.c.i:; ${CC} -E ${CFLAGS} $< > $@
.c.s:; ${CC} ${CFLAGS} -s $<
.SUFFIXES: .oz .od .asm
.c.o:; ${CC} ${CFLAGS} -c ${C_NO_FNAMES} $<
.c.oz:; ${CC} ${CFLAGS} -c ${C_NO_FNAMES} ${C_MODULE} ${C_NO_STKCHK} -o $@ $<
.c.od:; ${CC} ${CFLAGS} -c -DTRACE=1 -g -o $@ $<
.asm.o:; ${AS} ${ASFLAGS} $< $@
.c.s:; ${CC} ${CFLAGS} -s ${C_NO_FNAMES} $<
#
# Main rules:
#
all: ${FILES}
@echo ${COMPONENT}: Application built (Disc)
@${ECHO} ${COMPONENT}: Application built (Disc)
rom: ${ROM_MODULE}
@echo ${COMPONENT}: Module built (ROM)
@${ECHO} ${COMPONENT}: Module built (ROM)
ifeq (${TARGET},ThemeDefs)
install:
${MKDIR} ${INSTDIR}.${USERIF}
${CP} LocalRes:DiscSprites.Sprites ${INSTDIR}.${USERIF}.Paint ${CPFLAGS}
${CP} LocalRes:DiscSprites.Sprites22 ${INSTDIR}.${USERIF}.Paint22 ${CPFLAGS}
@${ECHO} ${COMPONENT}: disc theme resources installed
else
install: ${FILES}
${MKDIR} ${INSTDIR}
${CP} ${RDIR}.!Boot ${INSTDIR}.!Boot ${CPFLAGS}
......@@ -153,7 +135,8 @@ install: ${FILES}
Access ${INSTDIR}.Messages lr/r
Access ${INSTDIR}.Sprites lr/r
Access ${INSTDIR}.Templates lr/r
@echo ${COMPONENT}: Application installed (Disc)
@${ECHO} ${COMPONENT}: Application installed (Disc)
endif
installd: ${FILESD}
${CP} ${RDIR}.!Boot ${INSTDIR}.!Boot ${CPFLAGS}
......@@ -170,11 +153,11 @@ installd: ${FILESD}
Access ${INSTDIR}.Messages lr/r
Access ${INSTDIR}.Sprites lr/r
Access ${INSTDIR}.Templates lr/r
@echo ${COMPONENT}: Debug application installed (Disc)
@${ECHO} ${COMPONENT}: Debug application installed (Disc)
install_rom: ${ROM_MODULE}
${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: Module installed (ROM)
@${ECHO} ${COMPONENT}: Module installed (ROM)
resources: ${MSGS}
${MKDIR} ${RESDIR}
......@@ -186,7 +169,7 @@ resources: ${MSGS}
${CP} ${MSGS} ${RESDIR}.Messages ${CPFLAGS}
${CP} ${LDIR}.Sprites ${RESDIR}.Sprites ${CPFLAGS}
${CP} ${LDIR}.Templates ${RESDIR}.Templates ${CPFLAGS}
@echo ${COMPONENT}: resource files copied to Messages module
@${ECHO} ${COMPONENT}: resource files copied to Messages module
clean:
${XWIPE} o.* ${WFLAGS}
......@@ -202,14 +185,14 @@ clean:
${RM} ${ROM_MODULE}
${RM} ${MSGS}
${RM} ${MODULE}
@echo ${COMPONENT}: cleaned
@${ECHO} ${COMPONENT}: cleaned
#
# Static dependencies:
#
abs.!RunImage: ${OBJS} ${RLIB} ${CLIB}
${LD} -o $@ ${OBJS} ${RLIB} ${CLIB}
${SQUEEZE} ${SQFLAGS} $@
${SQZ} ${SQZFLAGS} $@
${MODULE}: oz.ModuleWrap ${OBJSZ} ${RLIB} ${CLIB}
${LD} -o $@ -module oz.ModuleWrap ${OBJSZ} ${RLIB} ${CLIB}
......@@ -222,7 +205,7 @@ rom_link:
${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
-map > map.${COMPONENT}
${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom_link complete
@${ECHO} ${COMPONENT}: rom_link complete
oz.ModuleWrap: s.ModuleWrap ${MSGS} s.AppName ${RESFILES} s.Resfiles
${AS} ${AFLAGS} s.ModuleWrap $@
......
VersionASM
View file @ 6540feac
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.10"
Module_Version SETA 210
Module_MajorVersion SETS "2.11"
Module_Version SETA 211
Module_MinorVersion SETS ""
Module_Date SETS "14 Jan 2012"
Module_ApplicationDate SETS "14-Jan-12"
Module_Date SETS "11 Aug 2012"
Module_ApplicationDate SETS "11-Aug-12"
Module_ComponentName SETS "Paint"
Module_ComponentPath SETS "castle/RiscOS/Sources/Apps/Paint"
Module_FullVersion SETS "2.10"
Module_HelpVersion SETS "2.10 (14 Jan 2012)"
Module_FullVersion SETS "2.11"
Module_HelpVersion SETS "2.11 (11 Aug 2012)"
END
VersionNum
View file @ 6540feac
/* (2.10)
/* (2.11)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.10
#define Module_MajorVersion_CMHG 2.11
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Jan 2012
#define Module_Date_CMHG 11 Aug 2012
#define Module_MajorVersion "2.10"
#define Module_Version 210
#define Module_MajorVersion "2.11"
#define Module_Version 211
#define Module_MinorVersion ""
#define Module_Date "14 Jan 2012"
#define Module_Date "11 Aug 2012"
#define Module_ApplicationDate "14-Jan-12"
#define Module_ApplicationDate "11-Aug-12"
#define Module_ComponentName "Paint"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Paint"
#define Module_FullVersion "2.10"
#define Module_HelpVersion "2.10 (14 Jan 2012)"
#define Module_LibraryVersionInfo "2:10"
#define Module_FullVersion "2.11"
#define Module_HelpVersion "2.11 (11 Aug 2012)"
#define Module_LibraryVersionInfo "2:11"
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