Changeset 6896 for trunk/include

Timestamp:

Sep 30, 2001, 11:46:17 AM (24 years ago)

Author:

bird

Message:

Custombuild changes.

Location:

trunk/include

Files:

• odin32.mk (modified) (6 diffs)
• odin32.post.mk (modified) (2 diffs)
• odin32.post.vac3.mk (modified) (4 diffs)
• odin32.post.wat.mk (modified) (4 diffs)
• odin32.tools.emx.mk (modified) (2 diffs)
• odin32.tools.vac3.mk (modified) (2 diffs)
• odin32.tools.wat.mk (modified) (2 diffs)

trunk/include/odin32.mk

@@ -1 @@
-# $Id: odin32.mk,v 1.5 2001-08-04 14:16:17 bird Exp $
+# $Id: odin32.mk,v 1.6 2001-09-30 09:46:16 bird Exp $
 
 #
@@ -67 +67 @@
 !  else
 !    ifdef PROFILE
-ODIN32_BIN  = $(ODIN32_BIN_)\Debug$(DIREXT)
-ODIN32_BIN__= $(ODIN32_BIN_)\Debug$(DIREXT)
+ODIN32_BIN  = $(ODIN32_BIN_)\Profile$(DIREXT)
+ODIN32_BIN__= $(ODIN32_BIN_)\Profile$(DIREXT)
 !    else
 ODIN32_BIN  = $(ODIN32_BIN_)\Release$(DIREXT)
@@ -82 +82 @@
 !  else
 !    ifdef PROFILE
-ODIN32_LIB  = $(ODIN32_LIB_)\Debug$(DIREXT)
-ODIN32_LIB__= $(ODIN32_LIB_)\Debug$(DIREXT)
+ODIN32_LIB  = $(ODIN32_LIB_)\Profile$(DIREXT)
+ODIN32_LIB__= $(ODIN32_LIB_)\Profile$(DIREXT)
 !    else
 ODIN32_LIB  = $(ODIN32_LIB_)\Release$(DIREXT)
@@ -94 +94 @@
 !  ifdef DEBUG
 OBJDIR   = .\bin\Debug$(DIREXT)
-!    else
+!  else
 !    ifdef PROFILE
-OBJDIR   = .\bin\Debug$(DIREXT)
+OBJDIR   = .\bin\Profile$(DIREXT)
 !    else
 OBJDIR   = .\bin\Release$(DIREXT)
@@ -120 +120 @@
 # Altern configuration if we're making the custom build object library.
 #
+CUST =
 !if "$(CUSTOMBUILD)" == "1"
 !   ifndef LIBTARGET
 !       ifndef PUBLICLIB
-LIBTARGET = 1
-EXETARGET = 1
-PUBLICLIB = 1
+CUST        = o
+LIBTARGET   = 1
+PUBLICLIB   = 1
 WRC_PREFIX_RESOURCE=1
 !       else
@@ -153 +154 @@
 
 #
+# Compiler environment modifications for custombuild.
+#
+!if "$(CUSTOMBUILD)" == "1"
+DLLENTRY =
+!endif
+
+
+#
 # Include system tools
 #

trunk/include/odin32.post.mk

@@ -1 @@
-# $Id: odin32.post.mk,v 1.3 2001-08-04 14:27:25 bird Exp $
+# $Id: odin32.post.mk,v 1.4 2001-09-30 09:46:16 bird Exp $
 
 #
@@ -29 +29 @@
 #
 !if "$(CUSTOMBUILD)" == "1"
-TARGET = $(TARGET)o         # this just bearly works cause of stupid recursion...
 OBJS = $(OBJS:initterm.obj=dummy.obj)
 !endif

trunk/include/odin32.post.vac3.mk

@@ -1 @@
-# $Id: odin32.post.vac3.mk,v 1.20 2001-09-30 05:30:36 bird Exp $
+# $Id: odin32.post.vac3.mk,v 1.21 2001-09-30 09:46:16 bird Exp $
 
 #
@@ -265 +265 @@
         $(ADDITIONAL_ALL)
 !else
-        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
-        $(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION) \
+        $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
+        $(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
         $(ADDITIONAL_ALL)
 !endif
@@ -296 +296 @@
 #
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
+$(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJS)
     $(CMDQD_WAIT)
     $(RM) $@
@@ -357 +357 @@
 $(ODIN32_LIB)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET).lib
 !else
-$(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+$(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION)
 !endif
     @if not exist $(@D) $(CREATEPATH) $(@D)

trunk/include/odin32.post.wat.mk

@@ -1 @@
-# $Id: odin32.post.wat.mk,v 1.16 2001-09-30 00:59:03 bird Exp $
+# $Id: odin32.post.wat.mk,v 1.17 2001-09-30 09:46:16 bird Exp $
 
 #
@@ -247 +247 @@
         .SYMBOLIC
 !else
-        $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
-        $(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION) \
+        $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
+        $(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION) \
         $(ADDITIONAL_ALL) \
         .SYMBOLIC
@@ -279 +279 @@
 #       (fixme)
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
+$(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJS)
     $(RM) $@
     $(ILIB) $(ILIBFLAGS) $@ @<<
@@ -332 +332 @@
 $(ODIN32_LIB)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET).lib
 !else
-$(ODIN32_LIB)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
+$(ODIN32_LIB)\$(TARGET)$(CUST).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET)$(CUST).$(TARGET_EXTENSION)
 !endif
     @if not exist $^: $(CREATEPATH) $^:

trunk/include/odin32.tools.emx.mk

@@ -1 @@
-# $Id: odin32.tools.emx.mk,v 1.4 2001-08-16 04:13:20 bird Exp $
+# $Id: odin32.tools.emx.mk,v 1.5 2001-09-30 09:46:16 bird Exp $
 
 #
@@ -17 +17 @@
 # Make command definition.
 #
+!ifndef CUSTOMBUILD
 MAKE_CMD    = nmake /nologo
+!else
+MAKE_CMD    = nmake /nologo CUSTOMBUILD=1
+!endif
 !ifdef DEBUG
 MAKE_CMD    = $(MAKE_CMD) DEBUG=1

trunk/include/odin32.tools.vac3.mk

@@ -1 @@
-# $Id: odin32.tools.vac3.mk,v 1.6 2001-09-30 00:48:14 bird Exp $
+# $Id: odin32.tools.vac3.mk,v 1.7 2001-09-30 09:46:17 bird Exp $
 
 #
@@ -17 +17 @@
 # Make command definition.
 #
+!ifndef CUSTOMBUILD
 MAKE_CMD    = nmake /nologo
+!else
+MAKE_CMD    = nmake /nologo CUSTOMBUILD=1
+!endif
 !ifdef DEBUG
 MAKE_CMD    = $(MAKE_CMD) DEBUG=1

trunk/include/odin32.tools.wat.mk

@@ -1 @@
-# $Id: odin32.tools.wat.mk,v 1.5 2001-04-02 12:38:04 sandervl Exp $
+# $Id: odin32.tools.wat.mk,v 1.6 2001-09-30 09:46:17 bird Exp $
 
 #
@@ -18 +18 @@
 # Make command definition.
 #
-MAKE_CMDLINE= wmake -u
+MAKE_CMDLINE = wmake -u
+!ifdef CUSTOMBUILD
+MAKE_CMDLINE += CUSTOMBUILD=1
+!endif
 !if "$(%DEBUG)" != ""
 DEBUG = 1