Changeset 6422 for trunk/include

Timestamp:

Jul 31, 2001, 12:52:25 AM (24 years ago)

Author:

bird

Message:

Custombuild.

Location:

trunk/include

Files:

• odin32.mk (modified) (2 diffs)
• odin32.post.mk (modified) (2 diffs)
• odin32.post.vac3.mk (modified) (8 diffs)
• odin32.post.wat.mk (modified) (5 diffs)

trunk/include/odin32.mk

@@ -1 @@
-# $Id: odin32.mk,v 1.3 2001-06-25 23:17:53 bird Exp $
+# $Id: odin32.mk,v 1.4 2001-07-30 22:51:34 bird Exp $
 
 #
@@ -117 +117 @@
 
 #
+# Altern configuration if we're making the custom build object library.
+#
+!if "$(CUSTOMBUILD)" == "1"
+!   ifndef LIBTARGET
+!       ifndef PUBLICLIB
+LIBTARGET = 1
+EXETARGET = 1
+PUBLICLIB = 1
+WRC_PREFIX_RESOURCE=1
+!       else
+CUSTOMBUILD = 0
+!       endif
+!   else
+CUSTOMBUILD = 0
+!   endif
+!endif
+
+
+#
 # Include compiler environment.
 #

trunk/include/odin32.post.mk

@@ -1 @@
-# $Id: odin32.post.mk,v 1.1 2000-12-02 23:50:47 bird Exp $
+# $Id: odin32.post.mk,v 1.2 2001-07-30 22:50:51 bird Exp $
 
 #
@@ -24 +24 @@
 #
 
+
+#
+# Altern configuration if we're making the custom build object library.
+#
+!if "$(CUSTOMBUILD)" == "1"
+TARGET = $(TARGET)o         # this just bearly works cause of stupid recursion...
+OBJS = $(OBJS:initterm.obj=dummy.obj)
+!endif
+
+
+#
 # Include compiler spesific post rule file.
+#
 !include $(ODIN32_INCLUDE)/odin32.post.$(CCENV).mk
 
+
+#
+# dummy.obj helper rule.
+#
+$(OBJDIR)\dummy.obj: dummy.c
+
+dummy.c:
+    echo Creating dummy file: <<$@
+/* dummy file */
+<<KEEP
+

trunk/include/odin32.post.vac3.mk

@@ -1 @@
-# $Id: odin32.post.vac3.mk,v 1.14 2001-07-30 08:18:01 sandervl Exp $
+# $Id: odin32.post.vac3.mk,v 1.15 2001-07-30 22:50:52 bird Exp $
 
 #
@@ -144 +144 @@
 !ifndef NO_LNKFILE_RULE
 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
+!if "$(CCENV)" != "EMX"
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -153 +154 @@
 $(OBJDIR)\bldlevel.$(DEFFILE)
 <<keep
+!else
+    @echo Creating file <<$@
+$(OBJS: =+^
+)+$(EMX)\lib\dll0.obj,
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION),
+$(OBJDIR)\$(TARGET).map,
+$(LIBS: =+^
+),
+$(OBJDIR)\bldlevel.$(DEFFILE);
+<<keep
+!endif
 !endif
 
@@ -203 +215 @@
 !ifndef NO_LNKFILE_RULE
 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
+!if "$(CCENV)" != "EMX"
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -212 +225 @@
 $(OBJDIR)\bldlevel.$(DEFFILE)
 <<keep
+!else
+    @echo Creating file <<$@
+$(OBJS: =+^
+)+$(EMX)\lib\crt0.obj,
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION),
+$(OBJDIR)\$(TARGET).map,
+$(LIBS: =+^
+),
+$(OBJDIR)\bldlevel.$(DEFFILE);
+<<keep
+!endif
 !endif
 
@@ -272 +296 @@
 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
     $(RM) $@
-    -4 $(ILIB) $(ILIBFLAGS) $@ @<<
+!if "$(CCENV)" != "EMX"
+    -4 $(ILIB) $(ILIBFLAGS) $@ @<<$@.parm
 $(OBJS:  =&^
 )
 $(OBJDIR)\$(@B).lst
-<<
+<<keep
+!else
+    $(ILIB) $(ILIBFLAGS) $@ @<<$@.parm
+$(OBJS:  =^
+)
+<<keep
+!endif
 !endif
 
@@ -324 +355 @@
 $(ODIN32_LIB)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET).lib
 !else
-$(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(ORGTARGET).$(TARGET_EXTENSION)
+$(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
 !endif
     @if not exist $(@D) $(CREATEPATH) $(@D)
@@ -380 +411 @@
 !ifndef LIBTARGET
 !ifndef NOTEXPDEF
-!ifdef NOINTERNALFUNCTIONS
 $(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
-    $(IMPDEF) -I:20000 $** $@
-!else
-$(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
-    $(IMPDEF) $** $@
-!endif
+    $(IMPDEF) $(IMPDEF_FLAGS) $** $@
 !endif
 !endif

trunk/include/odin32.post.wat.mk

@@ -1 @@
-# $Id: odin32.post.wat.mk,v 1.13 2001-07-30 08:18:01 sandervl Exp $
+# $Id: odin32.post.wat.mk,v 1.14 2001-07-30 22:50:52 bird Exp $
 
 #
@@ -42 +42 @@
 #
 
+# Sanity check
+!ifndef ODIN32_LIB
+!   error "ODIN32_LIB is not defined"
+!endif ODIN32_LIB
+!ifndef ODIN32_TOOLS
+!   error "ODIN32_TOOLS is not defined"
+!endif ODIN32_TOOLS
+
 
 !ifndef TARGET_EXTENSION
@@ -185 +193 @@
 !endif
 !ifndef DEBUG
+!ifndef NO_LXLITE
     $(LXLITE) $@
+!endif
 !endif
 !endif
@@ -212 +222 @@
 !else # !ifndef LIBTARGET
 ###############################################################################
-# LIB target (internal object library)
+# LIB target (internal or public object library)
 ###############################################################################
 
@@ -372 +382 @@
 !ifndef LIBTARGET
 !ifndef NOTEXPDEF
-!ifdef NOINTERNALFUNCTIONS
 $(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
-    $(IMPDEF) -I:20000 $[@ $@
-!else
-$(OBJDIR)\$(ORGTARGET)exp.def: $(DEFFILE)
-    $(IMPDEF) $[@ $@
-!endif
+    $(IMPDEF) $(IMPDEF_FLAGS) $[@ $@
 !endif
 !endif