Changeset 4891 for trunk/include

Timestamp:

Jan 8, 2001, 11:51:51 PM (25 years ago)

Author:

bird

Message:

Merged two previous revisions - BuildLevel and LXOpt that was.
Seems like there was a mix of revision caused the Netlabs crash or Sander.

Location:

trunk/include

Files:

• odin32.post.vac3.mk (modified) (10 diffs)
• odin32.tools.mk (modified) (2 diffs)

trunk/include/odin32.post.vac3.mk

@@ -1 @@
-# $Id: odin32.post.vac3.mk,v 1.9 2001-01-05 23:23:05 sandervl Exp $
+# $Id: odin32.post.vac3.mk,v 1.10 2001-01-08 22:51:51 bird Exp $
 
 #
@@ -76 +76 @@
 !endif
 
-# Set default DEFFILE if needed. (Currently for dlls only.)
+# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
 !ifndef DEFFILE
-!   ifndef EXETARGET
 DEFFILE = $(ORGTARGET).def
-!   endif
 !endif
 
@@ -130 +128 @@
 #
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 !ifdef OS2RES
@@ -145 +143 @@
 #
 !ifndef NO_LNKFILE_RULE
-$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -153 +151 @@
 $(LIBS:  =^
 )
-$(DEFFILE)
+$(OBJDIR)\bldlevel.$(DEFFILE)
 <<keep
 !endif
@@ -189 +187 @@
 #
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 !ifdef OS2RES
@@ -204 +202 @@
 #
 !ifndef NO_LNKFILE_RULE
-$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -212 +210 @@
 $(LIBS:  =^
 )
-$(DEFFILE)
+$(OBJDIR)\bldlevel.$(DEFFILE)
 <<keep
 !endif
@@ -389 +387 @@
 
 #
+# Common: Make .def-file with buildlevel info.
+#
+$(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
+    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
+        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\versionos2.h" \
+        -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\versionos2.h"
+
+
+#
 # Common: Create the object directory.
 #
 $(OBJDIR):
     @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
+
+
+#
+# Common: Generate Visual SlickEdit project.
+#
+!ifndef NO_VSLICKRULES
+!ifdef ORGTARGET
+vslick $(ORGTARGET).vpj:
+    $(RM) $(ORGTARGET).vtg
+    $(ODIN32_BASE)\tools\vslick\genproject.cmd $(CINCLUDES) $(ORGTARGET).vpj
+!endif
+!endif
 
 
@@ -404 +423 @@
 clean:  clean2
 !endif
-#    $(RM) *.lib *.res *.map *.pch \
-    $(RM)  \
+    $(RM) *.lib *.res *.map *.pch \
 !if "$(OBJDIR)" != ""
      $(OBJDIR)\* \

trunk/include/odin32.tools.mk

@@ -1 @@
-# $Id: odin32.tools.mk,v 1.3 2001-01-05 23:23:05 sandervl Exp $
+# $Id: odin32.tools.mk,v 1.4 2001-01-08 22:51:51 bird Exp $
 
 #
@@ -47 +47 @@
 CREATEPATH  = $(ODIN32_TOOLS)\CreatePath.cmd
 EXECEXCL    = $(ODIN32_TOOLS)\ExecExcl.cmd
+BLDLEVELINF = $(ODIN32_TOOLS)\BldLevelInf.cmd
 LXLITE      = $(ODIN32_TOOLS)\lxlite.exe
+
 
 #