From 1e940ee8401fa564037d23c2cb89be4ee2bacd50 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Wed, 13 Oct 1999 10:24:49 +0000
Subject: [PATCH]   * dpmi can only be set after reading the options

---
 compiler/options.pas | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/options.pas b/compiler/options.pas
index 10166339a2..f54ff54824 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -1053,8 +1053,6 @@ begin
 {$ifdef i386}
   def_symbol('CPU86');
   def_symbol('CPU87');
-  if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then
-   def_symbol('DPMI'); { MSDOS is not defined in BP when target is DPMI }
 {$endif}
 {$ifdef m68k}
   def_symbol('CPU68');
@@ -1219,6 +1217,10 @@ begin
      (cs_profile in initmoduleswitches) then
     initglobalswitches:=initglobalswitches-[cs_link_strip];
 
+{ Set defines depending on the target }
+  if (target_info.target in [target_i386_GO32V1,target_i386_GO32V2]) then
+   def_symbol('DPMI'); { MSDOS is not defined in BP when target is DPMI }
+
   MaybeLoadMessageFile;
 
   dispose(option,Done);
@@ -1228,7 +1230,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.24  1999-10-03 19:44:41  peter
+  Revision 1.25  1999-10-13 10:24:49  peter
+    * dpmi can only be set after reading the options
+
+  Revision 1.24  1999/10/03 19:44:41  peter
     * removed objpasunit reference, tvarrec is now searched in systemunit
       where it already was located