Commit 1e4ace8f authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Reimport sources as text to allow diffing

For earlier history look in the attic at 'ChangeFSI,ffb'.
Makefile adjusted to use StdTools where possible.

Version 1.35. Tagged as 'ChangeFSI-1_35'
parent e0f3c425
......@@ -44,18 +44,9 @@ VPATH = @ JPEG6b hpcdtoppm btpc
MSGVERSION = ${AWK} -f Build:AwkVers
MSGS = ${DDIR}.Messages
#
# Tools:
#
MKDIR = do mkdir -p
AWK = GNU.gawk
CC = cc
C++ = c++
CP = copy
LD = link
RM = remove
SQUEEZE = squeeze -f
XWIPE = x wipe
include StdTools
include StdRules
include AppLibs
#
# Tool flags:
......@@ -63,48 +54,43 @@ XWIPE = x wipe
DFLAGS = -DDEFAULT_MAX_MEM=655360 -DRISCOS_TWEAK
CFLAGS = -IC: -c -depend !Depend ${INCLUDES} ${DFLAGS}
C++FLAGS= -IC: -c -depend !Depend ${INCLUDES} ${DFLAGS} -Xcc -ff
CPFLAGS = ~cfr~v
WFLAGS = ~c~v
INCLUDES =
include StdRules
include AppLibs
INCLUDES =
FILES =\
$(LDIR).!Help\
$(LDIR).!Run\
$(DDIR).!Boot\
$(LDIR).!Sprites\
$(LDIR).!Sprites11\
$(LDIR).!Sprites22\
$(DDIR).Documents.256sprites\
$(DDIR).Documents.CmdBasUse\
$(DDIR).Documents.DesktopUse\
$(DDIR).Documents.Formats\
$(DDIR).Documents.JPEGInfo\
$(DDIR).Documents.BTPCInfo\
$(DDIR).Documents.Theory\
$(DDIR).Palettes.Palette2\
$(DDIR).Palettes.Palette4\
$(DDIR).Palettes.Palette64\
$(DDIR).Palettes.Palette16\
$(DDIR).Palettes.Palette256\
$(DDIR).Palettes.CFSIict\
$(DDIR).btpc.btpc\
$(DDIR).btpc.HourOn\
$(DDIR).btpc.HourOff\
$(DDIR).btpc.!Run\
$(DDIR).hpcdtoppm\
$(LDIR).Template3D\
$(LDIR).Templates\
${LDIR}.!Help\
${LDIR}.!Run\
${DDIR}.!Boot\
${LDIR}.!Sprites\
${LDIR}.!Sprites11\
${LDIR}.!Sprites22\
${DDIR}.Documents.256sprites\
${DDIR}.Documents.CmdBasUse\
${DDIR}.Documents.DesktopUse\
${DDIR}.Documents.Formats\
${DDIR}.Documents.JPEGInfo\
${DDIR}.Documents.BTPCInfo\
${DDIR}.Documents.Theory\
${DDIR}.Palettes.Palette2\
${DDIR}.Palettes.Palette4\
${DDIR}.Palettes.Palette64\
${DDIR}.Palettes.Palette16\
${DDIR}.Palettes.Palette256\
${DDIR}.Palettes.CFSIict\
${DDIR}.btpc.btpc\
${DDIR}.btpc.HourOn\
${DDIR}.btpc.HourOff\
${DDIR}.btpc.!Run\
${DDIR}.hpcdtoppm\
${LDIR}.Template3D\
${LDIR}.Templates\
${MSGS} \
$(DDIR).djpeg.djpeg\
$(DDIR).djpeg.HourOn\
$(DDIR).djpeg.HourOff\
$(DDIR).djpeg.!Run\
$(DDIR).ChangeFSI\
$(DDIR).cjpeg \
${DDIR}.djpeg.djpeg\
${DDIR}.djpeg.HourOn\
${DDIR}.djpeg.HourOff\
${DDIR}.djpeg.!Run\
${DDIR}.ChangeFSI\
${DDIR}.cjpeg \
${DDIR}.JPEGprint.!Run \
${DDIR}.JPEGprint.JPEGprint
......@@ -210,115 +196,120 @@ HOBJS = ${HLIBOBJS}
#
# GENERIC RULES
#
all: $(FILES)
@echo $(COMPONENT): all built
all: ${FILES}
@${ECHO} ${COMPONENT}: all built
#
# Note that CFSIjpeg (required) comes as a byproduct of the SprExtend component
# Note that CFSIjpeg {required} comes as a byproduct of the SprExtend component
#
install: $(FILES)
Set Alias$CPFD $(CP) %0.%1 $(CFSIDIR).%1 $(CPFLAGS)
Set Alias$CPFDL CPFD %*0|MAccess $(CFSIDIR).%1 LR/r
install: ${FILES}
Set Alias$CPFD ${CP} %0.%1 ${CFSIDIR}.%1 ${CPFLAGS}
Set Alias$CPFDL CPFD %*0|MAccess ${CFSIDIR}.%1 LR/r
|
${MKDIR} $(CFSIDIR)
Access $(CFSIDIR) /r
${MKDIR} ${CFSIDIR}
Access ${CFSIDIR} /r
|
CPFDL $(LDIR) !Help
CPFDL $(LDIR) !Run
CPFDL $(DDIR) !Boot
CPFDL $(LDIR) !Sprites
CPFDL $(LDIR) !Sprites11
CPFDL $(LDIR) !Sprites22
$(MKDIR) $(CFSIDIR).Documents
CPFDL $(DDIR) Documents.256sprites
CPFDL $(DDIR) Documents.CmdBasUse
CPFDL $(DDIR) Documents.DesktopUse
CPFDL $(DDIR) Documents.Formats
CPFDL $(DDIR) Documents.JPEGInfo
CPFDL $(DDIR) Documents.BTPCInfo
CPFDL $(DDIR) Documents.Theory
$(MKDIR) $(CFSIDIR).Palettes
CPFDL $(DDIR) Palettes.Palette2
CPFDL $(DDIR) Palettes.Palette4
CPFDL $(DDIR) Palettes.Palette16
CPFDL $(DDIR) Palettes.Palette64
CPFDL $(DDIR) Palettes.Palette256
CPFDL $(DDIR) Palettes.CFSIict
CPFDL $(DDIR) hpcdtoppm
CPFDL $(DDIR) Messages
CPFDL $(LDIR) Templates
CPFDL $(LDIR) Template3D
CPFDL $(DDIR) ChangeFSI
CPFDL $(DDIR) cjpeg
$(MKDIR) $(CFSIDIR).btpc
CPFDL $(DDIR) btpc.btpc
CPFDL $(DDIR) btpc.!Run
CPFDL $(DDIR) btpc.HourOn
CPFDL $(DDIR) btpc.HourOff
$(MKDIR) $(CFSIDIR).djpeg
CPFDL $(DDIR) djpeg.djpeg
CPFDL $(DDIR) djpeg.!Run
CPFDL $(DDIR) djpeg.HourOn
CPFDL $(DDIR) djpeg.HourOff
$(MKDIR) $(CFSIDIR).JPEGprint
CPFDL $(DDIR) JPEGprint.!Run
CPFDL $(DDIR) JPEGprint.JPEGprint
CPFDL ${LDIR} !Help
CPFDL ${LDIR} !Run
CPFDL ${DDIR} !Boot
CPFDL ${LDIR} !Sprites
CPFDL ${LDIR} !Sprites11
CPFDL ${LDIR} !Sprites22
${MKDIR} ${CFSIDIR}.Documents
CPFDL ${DDIR} Documents.256sprites
CPFDL ${DDIR} Documents.CmdBasUse
CPFDL ${DDIR} Documents.DesktopUse
CPFDL ${DDIR} Documents.Formats
CPFDL ${DDIR} Documents.JPEGInfo
CPFDL ${DDIR} Documents.BTPCInfo
CPFDL ${DDIR} Documents.Theory
${MKDIR} ${CFSIDIR}.Palettes
CPFDL ${DDIR} Palettes.Palette2
CPFDL ${DDIR} Palettes.Palette4
CPFDL ${DDIR} Palettes.Palette16
CPFDL ${DDIR} Palettes.Palette64
CPFDL ${DDIR} Palettes.Palette256
CPFDL ${DDIR} Palettes.CFSIict
CPFDL ${DDIR} hpcdtoppm
CPFDL ${DDIR} Messages
CPFDL ${LDIR} Templates
CPFDL ${LDIR} Template3D
CPFDL ${DDIR} ChangeFSI
CPFDL ${DDIR} cjpeg
${MKDIR} ${CFSIDIR}.btpc
CPFDL ${DDIR} btpc.btpc
CPFDL ${DDIR} btpc.!Run
CPFDL ${DDIR} btpc.HourOn
CPFDL ${DDIR} btpc.HourOff
${MKDIR} ${CFSIDIR}.djpeg
CPFDL ${DDIR} djpeg.djpeg
CPFDL ${DDIR} djpeg.!Run
CPFDL ${DDIR} djpeg.HourOn
CPFDL ${DDIR} djpeg.HourOff
${MKDIR} ${CFSIDIR}.JPEGprint
CPFDL ${DDIR} JPEGprint.!Run
CPFDL ${DDIR} JPEGprint.JPEGprint
|
Unset Alias$CPFDL
Unset Alias$CPFD
|
@echo $(COMPONENT): installed
@${ECHO} ${COMPONENT}: installed
clean:
$(RM) $(DDIR).ChangeFSI
$(RM) $(DDIR).JPEGprint.JPEGprint
$(RM) $(DDIR).btpc.btpc
$(RM) $(DDIR).DJpeg.DJpeg
$(RM) $(DDIR).CJpeg
$(RM) CJpeg
$(RM) DJpeg
$(RM) $(DDIR).hpcdtoppm
${RM} ${DDIR}.ChangeFSI
${RM} ${DDIR}.JPEGprint.JPEGprint
${RM} ${DDIR}.btpc.btpc
${RM} ${DDIR}.DJpeg.DJpeg
${RM} ${DDIR}.CJpeg
${RM} CJpeg
${RM} DJpeg
${RM} ${DDIR}.hpcdtoppm
${RM} ${MSGS}
${XWIPE} n ${WFLAGS}
${XWIPE} o.* ${WFLAGS}
@echo $(COMPONENT): cleaned
@${ECHO} ${COMPONENT}: cleaned
#------------------------------------------------------------------------------
# ChangeFSI
#------------------------------------------------------------------------------
$(DDIR).ChangeFSI: ${SDIR}.ChangeFSI
crunch.ChangeFSI; BASIC
${DDIR}.ChangeFSI: n.ChangeFSI
${RUN}crunch.ChangeFSI; BASIC
n.ChangeFSI: ${SDIR}.ChangeFSI
${MKDIR} n
${NUMBER} ${SDIR}.ChangeFSI $@
#------------------------------------------------------------------------------
# JPEGprint
#------------------------------------------------------------------------------
$(DDIR).JPEGprint.JPEGprint: o.JPEGprint ${CLIB}
${DDIR}.JPEGprint.JPEGprint: o.JPEGprint ${CLIB}
${LD} -o $@ o.JPEGprint ${CLIB}
${SQUEEZE} $@
${SQZ} $@
#------------------------------------------------------------------------------
# JPEG
#------------------------------------------------------------------------------
$(DDIR).CJpeg: ${COBJS} ${CLIB}
${DDIR}.CJpeg: ${COBJS} ${CLIB}
${LD} -o $@ ${COBJS} ${CLIB}
${SQUEEZE} $@
${SQZ} $@
$(DDIR).DJpeg.DJpeg: ${DOBJS} ${CLIB}
${DDIR}.DJpeg.DJpeg: ${DOBJS} ${CLIB}
${LD} -o $@ ${DOBJS} ${CLIB}
${SQUEEZE} $@
${SQZ} $@
#------------------------------------------------------------------------------
# HPCDTOPPM
#------------------------------------------------------------------------------
$(DDIR).hpcdtoppm: ${HLIBOBJS} ${CLIB}
${DDIR}.hpcdtoppm: ${HLIBOBJS} ${CLIB}
${LD} -o $@ ${HLIBOBJS} ${CLIB}
${SQUEEZE} $@
${SQZ} $@
#------------------------------------------------------------------------------
# BTPC
#------------------------------------------------------------------------------
$(DDIR).btpc.btpc: ${BOBJS} ${C++LIB} ${CLIB}
${DDIR}.btpc.btpc: ${BOBJS} ${C++LIB} ${CLIB}
${LD} -c++ -o $@ ${BOBJS} ${C++LIB} ${CLIB}
${SQUEEZE} $@
${SQZ} $@
#------------------------------------------------------------------------------
# MESSAGES
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.34"
Module_Version SETA 134
Module_MajorVersion SETS "1.35"
Module_Version SETA 135
Module_MinorVersion SETS ""
Module_Date SETS "25 Sep 2012"
Module_ApplicationDate SETS "25-Sep-12"
Module_Date SETS "27 Oct 2012"
Module_ApplicationDate SETS "27-Oct-12"
Module_ComponentName SETS "ChangeFSI"
Module_ComponentPath SETS "mixed/RiscOS/Sources/Apps/ChangeFSI"
Module_FullVersion SETS "1.34"
Module_HelpVersion SETS "1.34 (25 Sep 2012)"
Module_FullVersion SETS "1.35"
Module_HelpVersion SETS "1.35 (27 Oct 2012)"
END
/* (1.34)
/* (1.35)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.34
#define Module_MajorVersion_CMHG 1.35
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Sep 2012
#define Module_Date_CMHG 27 Oct 2012
#define Module_MajorVersion "1.34"
#define Module_Version 134
#define Module_MajorVersion "1.35"
#define Module_Version 135
#define Module_MinorVersion ""
#define Module_Date "25 Sep 2012"
#define Module_Date "27 Oct 2012"
#define Module_ApplicationDate "25-Sep-12"
#define Module_ApplicationDate "27-Oct-12"
#define Module_ComponentName "ChangeFSI"
#define Module_ComponentPath "mixed/RiscOS/Sources/Apps/ChangeFSI"
#define Module_FullVersion "1.34"
#define Module_HelpVersion "1.34 (25 Sep 2012)"
#define Module_LibraryVersionInfo "1:34"
#define Module_FullVersion "1.35"
#define Module_HelpVersion "1.35 (27 Oct 2012)"
#define Module_LibraryVersionInfo "1:35"
This diff is collapsed.
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