* msg2inc compile works

This commit is contained in:
peter 1998-09-10 13:53:54 +00:00
parent 73c208663d
commit c914391f33

View File

@ -72,6 +72,11 @@ ifndef LANGUAGE
LANGUAGE=e LANGUAGE=e
endif endif
# Release version ?
ifdef RELEASE
OPT=-Xs -OG2p2
endif
##################################################################### #####################################################################
# Setup Files Directories # Setup Files Directories
##################################################################### #####################################################################
@ -192,14 +197,14 @@ endif
# set correct defines (also needed by mkdep) # set correct defines (also needed by mkdep)
PPDEFS:=-d$(CPU) -dGDB -dFPC PPDEFS:=-d$(CPU) -dGDB -dFPC
# for i386 also insert MMX support
ifdef i386
PPDEFS:=$(PPDEFS) -dSUPPORT_MMX
endif
# Set the needed compiler options # Set the needed compiler options
PPOPTS:=$(OPT) $(LOCALOPT) $(PPDEFS) -Sg -T$(TARGET) PPOPTS:=$(OPT) $(LOCALOPT) $(PPDEFS) -Sg -T$(TARGET)
# for win32 create at least 8 mb heap
ifdef Win32
PPOPTS:=$(PPOPTS) -Ch8000000
endif
# Unitdir specified ? # Unitdir specified ?
ifneq ("$(UNITDIR)", "") ifneq ("$(UNITDIR)", "")
PPOPTS:=$(PPOPTS) -Up$(UNITDIR) PPOPTS:=$(PPOPTS) -Up$(UNITDIR)
@ -213,6 +218,9 @@ endif
# Create the whole compiler commandline # Create the whole compiler commandline
COMPILER=$(PP) $(PPOPTS) COMPILER=$(PP) $(PPOPTS)
# RTL options
RTLOPTS=$(OPT) $(RTLOPT)
##################################################################### #####################################################################
# Setup os-independent filenames # Setup os-independent filenames
##################################################################### #####################################################################
@ -225,6 +233,7 @@ TEMPNAME1=ppc1$(EXEEXT)
TEMPNAME2=ppc2$(EXEEXT) TEMPNAME2=ppc2$(EXEEXT)
TEMPNAME3=ppc3$(EXEEXT) TEMPNAME3=ppc3$(EXEEXT)
MAKEDEP=mkdep$(EXEEXT) MAKEDEP=mkdep$(EXEEXT)
MSG2INC=msg2inc$(EXEEXT)
PASFILES:=$(wildcard *.pas) PASFILES:=$(wildcard *.pas)
INCFILES:=$(wildcard *.inc) INCFILES:=$(wildcard *.inc)
@ -242,7 +251,7 @@ MSGFILES:=$(wildcard *.msg)
diff diff3 patch rtl toflor replacediff3 restorediff3 \ diff diff3 patch rtl toflor replacediff3 restorediff3 \
test rtlzip rtlclean \ test rtlzip rtlclean \
# also call ppas if with command option -s # also call ppas if with command option -s
ifeq (,$(findstring -s ,$(COMPILER))) ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
else else
@ -284,13 +293,14 @@ next :
else else
next : next :
$(MAKE) clean $(MAKE) clean
$(MAKE) -C $(UNITDIR) clean $(MAKE) -C $(UNITDIR) libsclean
$(MAKE) -C $(UNITDIR) 'PP=$(COMPILERDIR)/$(PP)' all $(MAKE) -C $(UNITDIR) 'PP=$(COMPILERDIR)/$(PP)' 'OPT=$(RTLOPTS)' all
$(MAKE) all $(MAKE) all
endif endif
clean : clean :
-rm -f *.o *.ppu *.ppw *.s $(EXENAME) -rm -rf *.sl
-rm -f *.a *.o *.ppu *.ppw *.s $(EXENAME)
distclean: clean distclean: clean
-rm -f $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) -rm -f $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3)
@ -315,7 +325,7 @@ info :
ifdef inlinux ifdef inlinux
$(MAKEDEP) : $(RTLDIR)/utils/mkdep.pp $(MAKEDEP) : $(RTLDIR)/utils/mkdep.pp
$(PP) $(RTLDIR)/utils/mkdep.pp $(COMPILER) $(RTLDIR)/utils/mkdep.pp
$(CP) $(RTLDIR)/utils/$(MAKEDEP) $(MAKEDEP) $(CP) $(RTLDIR)/utils/$(MAKEDEP) $(MAKEDEP)
dependencies : $(MAKEDEP) dependencies : $(MAKEDEP)
@ -329,8 +339,12 @@ endif
# Make targets # Make targets
##################################################################### #####################################################################
msgtxt.inc: $(MSGFILE) $(MSG2INC): $(RTLDIR)/utils/msg2inc.pp
$(RTLDIR)/utils/msg2inc $(MSGFILE) msg msg $(COMPILER) $(RTLDIR)/utils/msg2inc.pp
$(CP) $(RTLDIR)/utils/$(MSG2INC) $(MSG2INC)
msgtxt.inc: $(MSGFILE) $(MSG2INC)
$(RTLDIR)/utils/$(MSG2INC) $(MSGFILE) msg msg
msg: msgtxt.inc msg: msgtxt.inc
@ -350,8 +364,8 @@ endif
remake: $(EXENAME) remake: $(EXENAME)
$(REPLACE) $(EXENAME) $(TEMPNAME) $(REPLACE) $(EXENAME) $(TEMPNAME)
$(MAKE) clean $(MAKE) clean
$(MAKE) -C $(UNITDIR) clean $(MAKE) -C $(UNITDIR) libsclean
$(MAKE) -C $(UNITDIR) 'PP=$(COMPILERDIR)/$(TEMPNAME)' all $(MAKE) -C $(UNITDIR) 'PP=$(COMPILERDIR)/$(TEMPNAME)' 'OPT=$(RTLOPTS)' all
$(MAKE) 'PP=./$(TEMPNAME)' all $(MAKE) 'PP=./$(TEMPNAME)' all
remake3: $(TEMPNAME3) remake3: $(TEMPNAME3)
@ -374,13 +388,13 @@ $(TEMPNAME3) : $(TEMPNAME2)
cycle: cycle:
$(MAKE) clean $(MAKE) clean
$(MAKE) -C $(UNITDIR) clean $(MAKE) -C $(UNITDIR) libsclean
$(MAKE) -C $(UNITDIR) $(MAKE) -C $(UNITDIR)
$(MAKE) remake3 $(MAKE) remake3
$(MAKE) echotime $(MAKE) echotime
ansirtl: ansirtl:
$(MAKE) -C $(UNITDIR) clean $(MAKE) -C $(UNITDIR) libsclean
$(MAKE) -C $(UNITDIR) PP=$(COMPILERDIR)/ppc386 \ $(MAKE) -C $(UNITDIR) PP=$(COMPILERDIR)/ppc386 \
OPT='-g -dUSeAnsiStrings' all OPT='-g -dUSeAnsiStrings' all
@ -492,7 +506,7 @@ rtl :
$(MAKE) -C $(UNITDIR) all $(MAKE) -C $(UNITDIR) all
rtlclean : rtlclean :
$(MAKE) -C $(UNITDIR) clean $(MAKE) -C $(UNITDIR) libsclean
# just a quick way to get ppc68k # just a quick way to get ppc68k
$(M68KEXENAME): $(M68KEXENAME):
@ -503,10 +517,12 @@ $(M68KEXENAME):
test: test:
@echo time is $(STARTTIME) date.exe is $(DATE) @echo time is $(STARTTIME) date.exe is $(DATE)
# Test of log at the end #
# does CVS add # at start of each line ??
# $Log$ # $Log$
# Revision 1.31 1998-09-09 18:26:25 michael # Revision 1.1 1998-09-10 13:53:54 peter
# * msg2inc compile works
#
# Revision 1.31 1998/09/09 18:26:25 michael
# Spaces to tabs... # Spaces to tabs...
# #
# Revision 1.30 1998/09/09 18:17:15 florian # Revision 1.30 1998/09/09 18:17:15 florian