Browse Source

+ needobjdir,needlibdir

peter 26 years ago
parent
commit
29927b0d6b
3 changed files with 22 additions and 9 deletions
  1. 7 2
      base/makefile.fpc
  2. 10 5
      ide/text/Makefile
  3. 5 2
      ide/text/weditor.pas

+ 7 - 2
base/makefile.fpc

@@ -402,8 +402,13 @@ override PPOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
 endif
 
 # Library dirs
-ifdef LIBDIR
-override PPOPT+=$(addprefix -Fl,$(LIBDIR))
+ifdef NEEDLIBDIR
+override PPOPT+=$(addprefix -Fl,$(NEEDLIBDIR))
+endif
+
+# Object dirs
+ifdef NEEDOBJDIR
+override PPOPT+=$(addprefix -Fo,$(NEEDOBJDIR))
 endif
 
 # Add include dirs INC and PROCINC and OSINC

+ 10 - 5
ide/text/Makefile

@@ -16,6 +16,10 @@
 # Defaults
 #####################################################################
 
+ifdef inlinux
+LIBDIR=/usr/lib/gcc-lib/i486-linux/2.7.2.3
+endif
+
 # We always need the API and FV
 NEEDUNITDIR=../../api ../../fv
 
@@ -30,10 +34,8 @@ endif
 # when including debugger include the gdbinterface
 ifdef GDB
 override NEEDUNITDIR+=../../gdbint
-ifdef inlinux
-LIBDIR=/usr/lib/gcc-lib/i486-linux/2.7.2.3
-endif
-override LIBDIR+=../../gdbint/libgdb
+NEEDLIBDIR+=../../gdbint/libgdb
+NEEDOBJDIR+=../../gdbint/libgdb
 else
 override NEEDUNITDIR+=../fake/gdb
 endif
@@ -87,7 +89,10 @@ fullgdb:
 
 #
 # $Log$
-# Revision 1.5  1999-01-28 19:58:23  peter
+# Revision 1.6  1999-01-29 10:34:31  peter
+#   + needobjdir,needlibdir
+#
+# Revision 1.5  1999/01/28 19:58:23  peter
 #   * makefile updates
 #
 # Revision 1.4  1999/01/22 18:10:42  pierre

+ 5 - 2
ide/text/weditor.pas

@@ -1325,7 +1325,7 @@ begin
   begin
     AY:=Delta.Y+Y;
     Color:=ColorTab[coTextColor];
-    FillChar(FreeFormat,SizeOf(FreeFormat),true);
+    FillChar(FreeFormat,SizeOf(FreeFormat),1);
     MoveChar(B,' ',Color,Size.X);
     if AY<LineCount then Line:=GetLine(AY) else Line:=@NulLine;
     GetDisplayTextFormat(AY,LineText,Format);
@@ -3224,7 +3224,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.8  1999-01-21 11:54:31  peter
+  Revision 1.9  1999-01-29 10:34:33  peter
+    + needobjdir,needlibdir
+
+  Revision 1.8  1999/01/21 11:54:31  peter
     + tools menu
     + speedsearch in symbolbrowser
     * working run command