Ver código fonte

* fix writing of -T<targetos>

peter 20 anos atrás
pai
commit
512c6483ef
2 arquivos alterados com 15 adições e 6 exclusões
  1. 3 3
      installer/install.dat
  2. 12 3
      installer/install.pas

+ 3 - 3
installer/install.dat

@@ -565,7 +565,7 @@ endcfg
 
 defaultidecfg=
 #IFDEF NORMAL
- -T$3
+ -T%targetos%
  -Sg
  -O1
  -OG
@@ -582,7 +582,7 @@ defaultidecfg=
 #ENDIF
 
 #IFDEF DEBUG
- -T$3
+ -T%targetos%
  -Sg
  -Cr
  -Ci
@@ -601,7 +601,7 @@ defaultidecfg=
 #ENDIF
 
 #IFDEF RELEASE
- -T$3
+ -T%targetos%
  -Sg
  -O1
  -O2

+ 12 - 3
installer/install.pas

@@ -697,9 +697,15 @@ program install;
            Replace(s,'%basepath%',data.basepath);
            Replace(s,'%targetname%',targetname);
            if pos('-',targetname)=0 then
-             Replace(s,'%fpctargetmacro%','$FPCOS')
+	     begin
+	       Replace(s,'%targetos%',targetname);
+               Replace(s,'%fpctargetmacro%','$FPCOS')
+	     end  
            else
-             Replace(s,'%fpctargetmacro%','$FPCTARGET');
+	     begin
+	       Replace(s,'%targetos%',Copy(targetname,pos('-',targetname)+1,255));
+               Replace(s,'%fpctargetmacro%','$FPCTARGET');
+	     end;  
            writeln(t,s);
          end
        else
@@ -2040,7 +2046,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.27  2005-01-05 21:27:55  hajny
+  Revision 1.28  2005-01-07 16:48:14  peter
+    * fix writing of -T<targetos>
+
+  Revision 1.27  2005/01/05 21:27:55  hajny
     * error message boxes instead of writeln
 
   Revision 1.26  2005/01/05 17:43:44  armin