Changeset 51 for trunk/src/makefile.os2.icc.mk

Timestamp:

Apr 7, 2003, 3:30:32 AM (22 years ago)

Author:

bird

Message:

kMk and porting to kLib.

File:

• trunk/src/makefile.os2.icc.mk (modified) (7 diffs)

trunk/src/makefile.os2.icc.mk

@@ -33 +33 @@
 POSTFIX     = .prf
 !endif
-OBJDIR      = ..\obj\os2-icc-kmk.$(POSTFIX)
+OBJDIR      = ..\obj\os2-icc-kmk$(POSTFIX)
 
 # paths
@@ -40 +40 @@
 
 # compiler setup
+CC          = icc.exe
 !ifdef DEBUG
 CFLAGS_1    = /O- -DDEBUG
@@ -46 +47 @@
 CFLAGS_1    = /O+ /Gh
 !endif
-CFLAGS      = /Q /Ti+ /Gm /Ge /Gl -DOS2 -D__i386__ -DKMK -I$(PATH_KLIB)\Generic\include -I$(PATH_TOOLKIT)\h -I$(PATH_VAC308)\include $(CFLAGS_1)
-CFLAGS_KMK  = /IkMk\include $(CFLAGS)
+CFLAGS      = /Q /Ti+ /Gm /Ge /Gl /W3 -DOS2 -D__i386__ -DKMK \
+              -I$(PATH_KLIB)\Generic\include \
+              -I$(PATH_KLIB)\Generic\include\kLibCRT \
+              -I$(PATH_TOOLKIT)\h \
+              -I$(PATH_VAC308)\include \
+              $(CFLAGS_1)
+CFLAGS_KMK  = -IkMk\include -IkMk -DUSE_KLIB $(CFLAGS) -UDEBUG  -DMACHINE=\"ibmos2\" -DMACHINE_ARCH=\"x86\" -DMACHINE_CPU=\"386\" \
 
 # linker setup
+LD          = ilink.exe
+STRIP       =
 !ifdef DEBUG
 LDFLAGS_1   = /NOEXEPACK
@@ -57 +65 @@
 !endif
 !ifndef LDFLAGS_1 #releas
-LDFLAGS_1   = /EXEPACK:2 /Packcode /Packdata
+LDFLAGS_1   = /Packcode /Packdata
+STRIP       = lxlite.exe
 !endif
 LDFLAGS     = /NoLogo /NoExtDictionary /Optfunc /Base:0x10000 /Map /Linenumbers /Debug /PmType:vio $(LDFLAGS_1)
@@ -73 +82 @@
 
 {.\kMk\lst.lib}.c{$(OBJDIR)}.obj:
-    $(CC) -c $(CFLAGS_KMK) -Fo$(OBJDIR)\$(@F) $(MAKEDIR)\kMk\lst.lib$(<F)
+    $(CC) -c $(CFLAGS_KMK) -Fo$(OBJDIR)\$(@F) $(MAKEDIR)\kMk\lst.lib\$(<F)
 
 
@@ -143 +152 @@
 !endif
 !endif
-$(PATH_TOOLKIT)\os2386.lib \
-$(VAC308_TOOLKIT)\cppom30.lib \
-                    
-                
-# the rules             
+$(PATH_TOOLKIT)\lib\os2386.lib \
+$(PATH_VAC308)\lib\cppom30.lib \
+
+
+# the rules
 all: $(OBJDIR) $(OBJDIR)\kMk.exe
 
 
 $(OBJDIR):
-    -mkdir ..\obj
-    -mkdir $(OBJDIR)
+    -if not exist ..\obj    mkdir ..\obj
+    -if not exist $(OBJDIR) mkdir $(OBJDIR)
 
 $(OBJDIR)\kMk.exe: $(OBJS)
@@ -162 +171 @@
 $(LIBS)
 <<KEEP
+!if "$(STRIP)" != ""
+    copy $(OBJDIR)\kMk.exe $(OBJDIR)\kMk.dbg
+    $(STRIP) $(OBJDIR)\kMk.exe
+!endif
 
+
+clean:
+!if "$(OBJDIR)" != "" && "$(OBJDIR)" != "\"
+!if "$(COMSPEC:CMD.EXE=sure)" != "$(COMSPEC)"
+    -del /N $(OBJDIR)\*
+!else # assume 4os2
+    -del /Y /E $(OBJDIR)\*
+!endif
+!endif