Changeset 16 for trunk/src/os2ahci/wmakefile

Timestamp:

Sep 17, 2010, 11:45:29 AM (15 years ago)

Author:

markus

Message:

Changed wmakefile to use link.exe and alp.exe (Assembler) from DDK, now it compiles.

File:

• trunk/src/os2ahci/wmakefile (modified) (7 diffs)

trunk/src/os2ahci/wmakefile

@@ -1 +1 @@
 ###############################################################################
+# wmakefile - makefile for os2ahci driver using WATCOM compiler
 #
-# wmakefile - Watcom makefile for os2ahci driver
-#
-# NOTE: This is a wmake file! See here:
-# http://www.openwatcom.org/index.php/Using_wmake
-#
-
-#
-# Copyright (c) 2010 Markus Thielen, Christian Mueller. 
+# Copyright (c) 2010 Christian Mueller, Markus Thielen.
 # Parts copied from/inspired by the Linux AHCI driver; 
 # those parts are (c) Linux AHCI/ATA maintainers
@@ -26 +20 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
 ###############################################################################
-# wmake options
+# Environment
 
-# disable prompt to delete out of date files on compile errors
-.ERASE   
+# main path to OS/2 DDK; this needs to be set before this makefile will work
+!ifndef DDK
+DDK          = i:\ddk
+!endif
+
+# main path to WATCOM installation
+!ifndef WATCOM
+WATCOM       = i:\watcom
+!endif
+
+CC_INCLUDE   = -I$(DDK)\base\h \
+               -I$(DDK)\base\ibmh \
+               -I$(DDK)\base\src\dev\dasd\diskh \
+               -I$(WATCOM)\h
+
+AS_INCLUDE   = -I:$(DDK)\base\inc \
+               -I:$(DDK)\base\src\dev\dasd\diskinc
+
+LIB_DIRS     = $(DDK)\base\lib\ \
+               $(DDK)\base\src\dev\dasd\devhlp\ \
 
 
 ###############################################################################
 # Tool Chain
-
-AS            = wasm    # Watcom assembler  
-CC            = wcc     # Watcom 16bit compiler
-LD            = wlink   # Watcom linker
-
-
-###############################################################################
-# Environment
 #
-# we need the following set before this makefile is called:
-#
-# WATCOM - to the base WATCOM installation directory
-# DDK    - to the base dir of the OS/2 DDK to use
-# PS     - the path separator (/ or \)
+# This makefile uses the Watcom 16bit compiler. 
+# Linker and assembler are link.exe and alp.exe that ship with the OS/2 DDK
 #
 
-DDK          = $(%DDK)
-WATCOM       = $(%WATCOM)
-!ifndef %PS
-PS           = \
-!else
-PS           = $(%PS)
-!endif
+AS            = $(DDK)\tools\alp.exe
+CC            = wcc
+LD            = $(DDK)\base\tools\link.exe
 
-CC_INCLUDE   = -I$(DDK)$(PS)BASE$(PS)H &
-               -I$(DDK)$(PS)BASE$(PS)IBMH &
-               -I$(DDK)$(PS)BASE$(PS)SRC$(PS)DEV$(PS)DASD$(PS)DISKH &
-               -I$(WATCOM)$(PS)h &
-
-AS_INCLUDE   = -I$(DDK)$(PS)BASE$(PS)INC &
-               -I$(DDK)$(PS)BASE$(PS)SRC$(PS)DEV$(PS)DASD$(PS)DISKINC
-
-#              the linker wants this on one line, no spaces...
-LIB_DIRS     = $(DDK)$(PS)BASE$(PS)LIB$;$(DDK)$(PS)BASE$(PS)SRC$(PS)DEV$(PS)DASD$(PS)DEVHLP;$(WATCOM)$(PS)LIB286$(PS)os2
-
+AFLAGS        = -Mb
+CFLAGS        = -ecc -bt=os2 -ms -zu -2 -w2 -wcd=138 -zp=1 -q -s -zdf
+CFLAGS_DEBUG  = -d3 -hc
+LFLAGS        = /noe /nod /packd /a:16 /batch /map /line 
 
 ###############################################################################
@@ -76 +67 @@
 TARGET   = os2ahci.add
 
-LIBS     = addcalls,dhcalls,doscalls,rmcalls,clibc
+LIBS     = addcalls dhcalls doscalls rmcalls
 
-SRCS     = init.asm libc.c os2ahci.c pci.c ahci.c ata.c atapi.c ctxhook.c
+SRCS     = init.asm math.asm libc.c os2ahci.c pci.c ahci.c ata.c atapi.c \
+           ctxhook.c
 
-OBJS     = init.obj libc.obj os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj&
-           ctxhook.obj
-
-#          the Watcom linker needs commas between object files
-LDOBJS   = init.obj,libc.obj,os2ahci.obj,pci.obj,ahci.obj,ata.obj,atapi.obj,&
+OBJS     = init.obj libc.obj os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj \
            ctxhook.obj
 
@@ -94 +82 @@
 clean:
         rm -f $(OBJS) $(TARGET)
-
-
-###############################################################################
-# compiler/linker flags
-
-AFLAGS        = -2 -bt=os2 -w3 -zq -ms
-CFLAGS        = -ecc -bt=os2 -ms -zu -2 -w2 -wcd=138 -zp=1 -q -s -zdf
-CFLAGS_DEBUG  = -d3 -hc
-LFLAGS        = name $(TARGET) system os2 dll initglobal option map option quiet &
-                option nodefaultlibs libpath $(LIB_DIRS) file $(LDOBJS) &
-                library $(LIBS) option nocaseexact #option packd=64k
-LFLAGS_DEBUG  = DEBUG CODEVIEW option cvpack
-
-!IFDEF DEBUG
-CFLAGS = $(CFLAGS) $(CFLAGS_DEBUG)
-LFLAGS = $(LFLAGS) $(LFLAGS_DEBUG)
-!ENDIF
 
 ###############################################################################
@@ -129 +100 @@
 atapi.obj:    atapi.c    wmakefile $(INCS) ata.h atapi.h
 
-ctxhook.obj:  ctxhook.c  wmakefile $(INCS)
+ctxhook.obj:  ctxhook.c  wmakefile $(INCS) ata.h atapi.h
 
 ###############################################################################
@@ -135 +106 @@
 
 .asm.obj:
-        $(AS) $(AFLAGS) $(AS_INCLUDE) $*.asm -fo=$*.obj
-        wdis -l $*.obj
+        $(AS) $(AFLAGS) $(AS_INCLUDE) $*.asm
 
 .c.obj:
@@ -143 +113 @@
 
 $(TARGET): $(OBJS) os2ahci.def wmakefile
-        $(LD) $(LFLAGS) 
+        $(LD) $(LFLAGS) $(OBJS),$(TARGET),$*.map,$(LIB_DIRS) $(LIBS),$*.def
+        mapsym os2ahci
 
+