Browse Source

build order fix

peter 20 years ago
parent
commit
5834a643c1
2 changed files with 8 additions and 7 deletions
  1. 2 2
      rtl/win32/Makefile
  2. 6 5
      rtl/win32/Makefile.fpc

+ 2 - 2
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/06]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -241,7 +241,7 @@ OBJPASDIR=$(RTL)/objpas
 GRAPHDIR=$(INC)/graph
 include $(WININC)/makefile.inc
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
-override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas macpas strings lineinfo heaptrc matrix windows ole2 activex shellapi shlobj winsock initc cmem dos crt objects graph messages sysutils classes typinfo math varutils variants cpu mmx charset ucomplex getopts wincrt winmouse winevent sockets printer dynlibs signals video mouse keyboard types comobj dateutils rtlconst sysconst winsysut strutils convutils
+override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas macpas strings lineinfo heaptrc matrix windows winsock initc cmem dynlibs signals dos crt objects graph messages rtlconst sysconst sysutils typinfo math types strutils convutils dateutils varutils variants classes cpu mmx charset ucomplex getopts wincrt winmouse winevent sockets printer video mouse keyboard comobj winsysut ole2 activex shellapi shlobj
 override TARGET_LOADERS+=wprt0 wdllprt0 gprt0 wcygprt0
 override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
 override INSTALL_FPCPACKAGE=y

+ 6 - 5
rtl/win32/Makefile.fpc

@@ -9,13 +9,14 @@ main=rtl
 loaders=wprt0 wdllprt0 gprt0 wcygprt0
 units=$(SYSTEMUNIT) systhrds objpas macpas strings \
       lineinfo heaptrc matrix \
-      windows ole2 activex shellapi shlobj winsock initc cmem \
+      windows winsock initc cmem dynlibs signals \
       dos crt objects graph messages \
-      sysutils classes typinfo math varutils variants \
+      rtlconst sysconst sysutils typinfo math types \
+      strutils convutils dateutils varutils variants classes \
       cpu mmx charset ucomplex getopts \
-      wincrt winmouse winevent sockets printer dynlibs signals \
-      video mouse keyboard types comobj dateutils rtlconst sysconst winsysut \
-      strutils convutils
+      wincrt winmouse winevent sockets printer \
+      video mouse keyboard \
+      comobj winsysut ole2 activex shellapi shlobj
 
 rsts=math varutils typinfo variants classes dateutils sysconst