diff --git a/components/synedit/Makefile b/components/synedit/Makefile index aa4ebf899c..ae6f655d36 100644 --- a/components/synedit/Makefile +++ b/components/synedit/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2002/09/21] +# Don't edit, this file is generated by FPCMake Version 1.1 [2002/11/21] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx @@ -58,6 +58,9 @@ ifdef inUnix PATHSEP=/ else PATHSEP:=$(subst /,\,/) +ifneq ($(findstring sh.exe,$(SHELL)),) +PATHSEP=/ +endif endif ifdef PWD BASEDIR:=$(subst \,/,$(shell $(PWD))) @@ -139,6 +142,16 @@ ifndef OS_TARGET OS_TARGET:=$(shell $(FPC) -iTO) endif endif +ifndef CPU_TARGET +ifdef CPU_TARGET_DEFAULT +CPU_TARGET=$(CPU_TARGET_DEFAULT) +endif +endif +ifndef OS_TARGET +ifdef OS_TARGET_DEFAULT +OS_TARGET=$(OS_TARGET_DEFAULT) +endif +endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) ifneq ($(FULL_TARGET),$(FULL_SOURCE)) @@ -209,7 +222,7 @@ endif endif export LCL_PLATFORM override TARGET_UNITS+=allunits -override TARGET_IMPLICITUNITS+=syntextdrawer syneditkeycmds synedittypes syneditstrconst syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer synedit synedithighlighter synhighlightermulti synregexpr synexporthtml syneditexport +override TARGET_IMPLICITUNITS+=syntextdrawer syneditkeycmds synedittypes syneditstrconst syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer synedit synedithighlighter synhighlightermulti synregexpr synexporthtml syneditexport synmemo synmacrorecorder syneditplugins override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override COMPILER_OPTIONS+=-gl override COMPILER_UNITDIR+=../../lcl/units/$(LCL_PLATFORM) ../../lcl/units . @@ -1453,6 +1466,7 @@ fpc_baseinfo: @$(ECHO) Rm........ $(RMPROG) @$(ECHO) GInstall.. $(GINSTALL) @$(ECHO) Echo...... $(ECHO) + @$(ECHO) Shell..... $(SHELL) @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) diff --git a/components/synedit/Makefile.fpc b/components/synedit/Makefile.fpc index 6b0154ada2..33b51c8fa1 100644 --- a/components/synedit/Makefile.fpc +++ b/components/synedit/Makefile.fpc @@ -17,7 +17,7 @@ units=allunits implicitunits=syntextdrawer syneditkeycmds synedittypes syneditstrconst \ syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer \ synedit synedithighlighter synhighlightermulti synregexpr synexporthtml \ - syneditexport + syneditexport synmemo synmacrorecorder syneditplugins [require] packages=fcl regexpr diff --git a/components/synedit/allunits.pp b/components/synedit/allunits.pp index 8dcc2520d3..ceb9411c1c 100644 --- a/components/synedit/allunits.pp +++ b/components/synedit/allunits.pp @@ -19,7 +19,7 @@ uses SynEdit, SynEditHighlighter, SynhighlighterPas, SynCompletion, SynEditAutoComplete, SynhighlighterHTML, SynhighlighterCPP, SynHighlighterXML, SynHighlighterLFM, SynHighlighterPerl, SynHighlighterMulti, SynRegExpr, - SynEditExport, SynExportHTML; + SynEditExport, SynExportHTML, SynMemo, SynMacroRecorder, SynEditPlugins; implementation @@ -28,6 +28,9 @@ end. { ============================================================================= $Log$ + Revision 1.12 2002/11/21 21:39:49 mattias + add synmemo.pas syneditplugins.pas synmacrorecorder.pas + Revision 1.11 2002/11/21 20:28:26 mattias added SynEditExport and SynExportHTML