Changeset 4872 for trunk/include

Timestamp:

Jan 6, 2001, 12:23:05 AM (25 years ago)

Author:

sandervl

Message:

update for LXLite

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.8 2000-12-16 23:40:54 bird Exp $
+# $Id: odin32.post.vac3.mk,v 1.9 2001-01-05 23:23:05 sandervl Exp $
 
 #
@@ -76 +76 @@
 !endif
 
-# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
+# Set default DEFFILE if needed. (Currently for dlls only.)
 !ifndef DEFFILE
+!   ifndef EXETARGET
 DEFFILE = $(ORGTARGET).def
+!   endif
 !endif
 
@@ -128 +130 @@
 #
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 !ifdef OS2RES
     $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
 !endif
+!ifndef DEBUG
+    $(LXLITE) $@
+!endif
 !endif
 
@@ -140 +145 @@
 #
 !ifndef NO_LNKFILE_RULE
-$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -148 +153 @@
 $(LIBS:  =^
 )
-$(OBJDIR)\bldlevel.$(DEFFILE)
+$(DEFFILE)
 <<keep
 !endif
@@ -184 +189 @@
 #
 !ifndef NO_MAIN_RULE
-$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
+$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 !ifdef OS2RES
     $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
 !endif
+!ifndef DEBUG
+    $(LXLITE) $@
+!endif
 !endif
 
@@ -196 +204 @@
 #
 !ifndef NO_LNKFILE_RULE
-$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
+$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     @echo Creating file <<$@
 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
@@ -204 +212 @@
 $(LIBS:  =^
 )
-$(OBJDIR)\bldlevel.$(DEFFILE)
+$(DEFFILE)
 <<keep
 !endif
@@ -381 +389 @@
 
 #
-# 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
 
 
@@ -417 +404 @@
 clean:  clean2
 !endif
-    $(RM) *.lib *.res *.map *.pch \
+#    $(RM) *.lib *.res *.map *.pch \
+    $(RM)  \
 !if "$(OBJDIR)" != ""
      $(OBJDIR)\* \

trunk/include/odin32.tools.mk

@@ -1 @@
-# $Id: odin32.tools.mk,v 1.2 2000-12-16 23:38:41 bird Exp $
+# $Id: odin32.tools.mk,v 1.3 2001-01-05 23:23:05 sandervl Exp $
 
 #
@@ -47 +47 @@
 CREATEPATH  = $(ODIN32_TOOLS)\CreatePath.cmd
 EXECEXCL    = $(ODIN32_TOOLS)\ExecExcl.cmd
-BLDLEVELINF = $(ODIN32_TOOLS)\BldLevelInf.cmd
-
+LXLITE      = $(ODIN32_TOOLS)\lxlite.exe
 
 #