Changeset 174 for sbliveos2/trunk/drv32/makefile.os2

Timestamp:

Apr 14, 2001, 6:26:09 PM (24 years ago)

Author:

sandervl

Message:

makefile updates

File:

• sbliveos2/trunk/drv32/makefile.os2 (modified) (4 diffs)

sbliveos2/trunk/drv32/makefile.os2

@@ -20 +20 @@
 #
 #******************************************************************************
+
 !include ..\include\version.mak
 
-INC     = .;$(%WATCOM)\H;..\runtime;..\include;$(%DDK)\base\h
-INCA    = -I:$(%DDK)\BASE\INC
+CINCLUDES = .;$(%WATCOM)\H;..\runtime;..\include;$(%DDK)\base\h
+AINCLUDES = -I:$(%DDK)\BASE\INC
 
-#===================================================================
-#
-#   Auto-dependency information
-#
-#===================================================================
-.ERASE
-.SUFFIXES:
-.SUFFIXES: .lst .obj .lib .cpp .c .asm .def
+LNKFILE = $(OBJDIR)\sblive32.lnk
 
-!if "$(DEBUG)" == "1"
-CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
-ASFLAGS = -Mb -Li -Sv:M510
-!else
-CFLAGS  = -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
-ASFLAGS = -Mb -Li -Sv:M510
-!endif
-
-!if "$(KEE)" == "1"
-CFLAGS  = $(CFLAGS) -mf -DKEE
-ASFLAGS = $(ASFLAGS) -D:KEE
-LNKFILE = sblivekee.lnk
-!else
-CFLAGS  = $(CFLAGS) -mc -zu
-LNKFILE = sblive.lnk
-!endif
-
-CC      = WPP386 $(CFLAGS) $(IWC)
-ASM     = alp $(ASFLAGS) $(INCA)
-
-DFLAGS  = -l -s
-DIS     = WDISASM $(DFLAGS)
-
-!if "$(DEBUG)" == "1"
-LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
-!else
-LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global
-!endif
-QFLAGS  = system os2 option quiet, map, align=512
-LINK    = WLINK $(LFLAGS)
-
-BFLAGS  = -s -t -c -b -q -n
-LIB     = WLIB $(BFLAGS)
-
-IFLAGS  = /nologo
-IMPLIB  = IMPLIB $(IFLAGS)
-
-.obj.lst:
-        $(DIS) $*
-
-.c.obj: .AUTODEPEND
-        $(CC) $*.c
-
-.cpp.obj: .AUTODEPEND
-        $(CC) $*.cpp
-
-.asm.obj: .AUTODEPEND
-        $(ASM) $*.asm -Fl:$*.lst
-
-.def.lib:
-        $(IMPLIB) $*.lib $*.def
+EVERYTHING_AS_CPP=1
+32BIT=1
+!include ..\makefile.inc
+!include ..\include\sblive32.mak
 
 #===================================================================
@@ -94 +41 @@
 FILE2    = strategy.obj
 FILE3    = init.obj
-FILE4    = impmvdm.lib devhlp.obj
+FILE4    = devhlp.obj
 FILE5    = idc.obj dispatch.obj
 FILE6    = impdos.lib
@@ -100 +47 @@
 FILE7    = impkee.lib
 !endif
-FILE8    = ..\sblive\sblive32.lib ..\lib32\linuxlib.lib
+FILE8    = impmvdm.lib
 FILELAST = end.obj
 FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILELAST)
+
 TARGET   = sblive32
-WMAPNAME = sblive32.wmap
+WMAPNAME = $(OBJDIR)\sblive32.wmap
 
 
@@ -113 +61 @@
 #
 #===================================================================
-all: $(TARGET).sys
+all: $(OBJDIR)\$(TARGET).sys
 
 $(LNKFILE): makefile.os2 ..\include\version.mak
-    @%write $^@ name $(TARGET).sys
     @%write $^@ option alignment=16
     @%write $^@ option description '@$#$(_VENDOR):$(_VERSION)$#@'
     @%write $^@ option map=$(WMAPNAME)
-    @for %f in ($(FILES)) do @%append $^@ file %f
-#!if "$(KEE)" == "1"
+# why the @#$@#$!@$ doesn't this work here?????????????????????/
+#    @%write $^@ name $(OBJDIR)\$(TARGET).sys
+    @%write $^@ name $(TARGET).sys
+    @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
     @%write $^@ import DOSIODELAYCNT DOSCALLS.427
-#!endif
+!if "$(KEE)" == "1"
+    @%write $^@ library $(SBLIVE_LIB)\sblive32kee.lib 
+    @%write $^@ library $(SBLIVE_LIB)\linuxlibkee.lib
+!else
+    @%write $^@ library $(SBLIVE_LIB)\sblive32.lib 
+    @%write $^@ library $(SBLIVE_LIB)\linuxlib.lib
+!endif
     @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib
 
-$(TARGET).sys: $(LNKFILE) $(FILES)
+$(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES)
      $(LINK) @$(LNKFILE)
-     ..\drv16\wat2map $(WMAPNAME) $(TARGET).MAP
+     $(WAT2MAP) $(WMAPNAME) $(OBJDIR)\$(TARGET).MAP
+     cd $(OBJDIR)
      mapsym $(TARGET).MAP
-     copy $(TARGET).sys ..\bin
+     cd ..\..
+#     copy $(TARGET).sys $(OBJDIR)\$(TARGET).sys
+     copy sblive32.sys bin\releasekee
 !ifdef KEE
-     copy $(TARGET).sys ..\bin\$(TARGET)kee.sys
+     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)kee.sys
 !else
-     copy $(TARGET).sys ..\bin\$(TARGET)w4.sys
+     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)w4.sys
 !endif
-     copy $(TARGET).sym ..\bin
+     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)
 
 clean:
+     cd $(OBJDIR)
      del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
-   
+     cd ..