* support fvision

installer/Makefile

@@ -988,7 +988,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1298,6 +1298,9 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
+override COMPILER+=-dFVISION
+endif
 installer.pas: install.pas
 	$(COPY) install.pas installer.pas
 install$(EXEEXT) : install.pas scroll$(PPUEXT)

installer/Makefile.fpc

@@ -29,6 +29,13 @@ fpcdir=..
 
 
 [rules]
+#
+# FVision or old FV detection
+#
+ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
+override COMPILER+=-dFVISION
+endif
+
 installer.pas: install.pas
         $(COPY) install.pas installer.pas
 

installer/install.pas

@@ -16,10 +16,6 @@
  **********************************************************************}
 program install;
 
-{$DEFINE FV}         (* TH - added to make use of the original Turbo Vision possible. *)
-{$ifdef FVISION}
-{$undef FV}
-{$endif}
 { $DEFINE DLL}       (* TH - if defined, UNZIP32.DLL library is used to unpack. *)
 { $DEFINE DOSSTUB}   (* TH - should _not_ be defined unless creating a bound DOS and OS/2 installer!!! *)
 (* Defining DOSSTUB causes adding a small piece of code    *)
@@ -81,15 +77,16 @@ program install;
      heaptrc,
 {$endif HEAPTRC}
      strings,dos,objects,drivers,
-{$IFDEF FV}
+{$IFNDEF FVISION}
      commands,
+     HelpCtx,
 {$ENDIF}
      unzip,ziptypes,
 {$IFDEF DLL}
      unzipdll,
 {$ENDIF}
      app,dialogs,views,menus,msgbox,colortxt,tabs,scroll,
-     HelpCtx,WHTMLScn;
+     WHTMLScn;
 
   const
      installerversion='1.0.4';
@@ -1654,7 +1651,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.1  2002-01-29 17:59:15  peter
+  Revision 1.2  2002-01-29 22:01:17  peter
+    * support fvision
+
+  Revision 1.1  2002/01/29 17:59:15  peter
     * moved installer
 
   Revision 1.2.2.16  2001/11/24 14:29:54  carl

installer/scroll.pas

@@ -18,7 +18,13 @@ unit Scroll;
 
 interface
 
-uses Objects,Commands,Drivers,Views,App;
+uses Objects,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
+     Drivers,Views,App;
 
 const
     CScrollBoxBackground = #6;
@@ -251,7 +257,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2002-01-29 17:59:15  peter
+  Revision 1.2  2002-01-29 22:01:17  peter
+    * support fvision
+
+  Revision 1.1  2002/01/29 17:59:15  peter
     * moved installer
 
   Revision 1.1.2.2  2001/05/02 16:22:44  pierre