Changeset 174


Ignore:
Timestamp:
Apr 14, 2001, 6:26:09 PM (24 years ago)
Author:
sandervl
Message:

makefile updates

Location:
sbliveos2/trunk
Files:
7 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • sbliveos2/trunk/drv16/dwavestrm.cpp

    r168 r174  
    4848    temp = (PSTREAMBUFFEREX)pStream->qhReturn.PopHead();
    4949    while(temp) {
    50         if(pStream->hstream) {
    51             rc = DevHelp_PostEventSem(pStream->hstream);
     50        if(pStream->hSem) {
     51            rc = DevHelp_PostEventSem(pStream->hSem);
    5252            if(rc != 0) {
    5353                dprintf(("DevHlp_PostEventSem returned %d", rc));
    … …  
    167167
    168168    if(hSem) {
     169        APIRET rc = DevHelp_PostEventSem(hSem);
     170        if(rc != 0) {
     171            dprintf(("DevHlp_PostEventSem returned %d", rc));
     172        }
    169173        if(DevHelp_CloseEventSem(hSem) != 0) {
    170174            dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));

  • sbliveos2/trunk/drv16/makefile.os2

    r166 r174  
    3131!include ..\include\version.mak
    3232
    33 #########################################
    34 # Options for Watcom 16-bit C compiler
    35 #########################################
    36 #  -bt=os2   = Build target OS is OS/2
    37 #  -ms       = Memory model small
    38 #  -3        = Enable use of 80386 instructions
    39 #  -4        = Optimize for 486 (assumes -3)
    40 #  -5        = Optimize for Pentium (assumes -3)
    41 #  -j        = char default is unsigned
    42 #  -d1       = Include line number info in object
    43 #              (necessary to produce assembler listing)
    44 #  -d2       = Include debugging info for ICAT
    45 #              (necessary to produce assembler listing)
    46 #  -o        = Optimization - i = enable inline intrinsic functions
    47 #                             r = optimize for 80486 and pentium pipes
    48 #                             s = space is preferred to time
    49 #                             l = enable loop optimizations
    50 #                             a = relax aliasing constraints
    51 #                             n = allow numerically unstable optimizations
    52 #  -s        = Omit stack size checking from start of each function
    53 #  -zl       = Place no library references into objects
    54 #  -wx       = Warning level set to maximum (vs 1..4)
    55 #  -zfp      = Prevent use of FS selector
    56 #  -zgp      = Prevent use of GS selector
    57 #  -zq       = Operate quietly
    58 #  -zm       = Put each function in its own segment
    59 #  -zu       = Do not assume that SS contains segment of DGROUP
    60 #
    61 CC=wcc
    62 CPP=wpp
    63 !if "$(DEBUG)" == "1"
    64 CFLAGS  =-ms -5 -bt=os2 -hc -d2 -oi -s -j -wx -zl -zfp -zgp -zq -zu -zp1 -DDEBUG -DTARGET_OS216
    65 CPPFLAGS=-ms -5 -bt=os2 -hc -d2 -oi -s -j -wx -zl -zfp -zgp -zq -zu -zp1 -DDEBUG -DTARGET_OS216
    66 LFLAGS  = d codeview
    67 !else
    68 CFLAGS  =-ms -5 -bt=os2         -oi -s -j -wx -zl -zfp -zgp -zq -zu -zp1 -DTARGET_OS216
    69 CPPFLAGS=-ms -5 -bt=os2    -olinars -s -j -wx -zl -zfp -zgp -zq -zu -zp1 -DTARGET_OS216
    70 LFLAGS  =
    71 !endif
    72 
    73 #########################################
    74 # Options for Watcom assembler
    75 #########################################
    76 #  -bt=os2   = Build target OS is OS/2
    77 #  -d1       = Include line number info in object
    78 #              (necessary to produce assembler listing)
    79 #  -i        = Include list
    80 #  -zq       = Operate quietly
    81 #  -3p       = 80386 protected-mode instructions
    82 #
    83 ASM=wasm
    84 AFLAGS=-d1 -zq -3p -i
    85 LINK=wlink $(LFLAGS)
    86 
    87 #########################################
    88 # Inference rules
    89 #########################################
    90 
    91 .c.obj: .AUTODEPEND
    92      $(CC) $(CPPFLAGS) $*.c
    93 
    94 .cpp.obj: .AUTODEPEND
    95      $(CPP) $(CPPFLAGS) $*.cpp
    96 
    97 .asm.obj: .AUTODEPEND
    98      $(ASM) $(AFLAGS) $*.asm
     33!include ..\makefile.inc
     34!include ..\include\sblive16.mak
    9935
    10036#########################################
    … …  
    11248OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9)
    11349
    114 all: $(NAME).sys $(NAME).sym
     50all: $(OBJDIR)\$(NAME).sys $(OBJDIR)\$(NAME).sym
    11551
    116 
    117 $(NAME).lrf: makefile.os2 ..\include\version.mak
     52$(OBJDIR)\$(NAME).lrf: makefile.os2 ..\include\version.mak
    11853   @%write $^@ system os2 dll
    11954   @%write $^@ option quiet
    … …  
    12156   @%write $^@ option caseexact
    12257   @%write $^@ option cache
    123    @%write $^@ option map=$(WMAPNAME)
     58   @%write $^@ option map=$(OBJDIR)\$(WMAPNAME)
    12459   @%write $^@ option description '@$#$(_VENDOR):$(_VERSION)$#@'
    125    @%write $^@ name $(NAME).sys
    126    @for %f in ($(OBJS)) do @%append $^@ file %f
     60   @%write $^@ name $(OBJDIR)\$(NAME).sys
     61   @for %f in ($(OBJS)) do @%append $^@ file $(OBJDIR)\%f
    12762   @%write $^@ import DOSIODELAYCNT DOSCALLS.427
    128    @%write $(NAME).lrf library $(%DDK)\BASE\lib\os2286.lib
    129    @%write $(NAME).lrf library ..\runtime\runtime.lib
    130    @%write $(NAME).lrf library $(%DDK)\BASE\src\dev\resource\rmcalls\rmcalls.lib
    131    @%write $(NAME).lrf library $(%DDK)\BASE\SRC\DEV\THINKPAD\DOCKII\APMCALLS\apmcalls.lib
    132    @%write $(NAME).lrf library $(%WATCOM)\lib286\plibs.lib
     63   @%write $(OBJDIR)\$(NAME).lrf library $(%DDK)\BASE\lib\os2286.lib
     64   @%write $(OBJDIR)\$(NAME).lrf library $(SBLIVE_LIB)\runtime.lib
     65   @%write $(OBJDIR)\$(NAME).lrf library $(%DDK)\BASE\src\dev\resource\rmcalls\rmcalls.lib
     66   @%write $(OBJDIR)\$(NAME).lrf library $(%DDK)\BASE\SRC\DEV\THINKPAD\DOCKII\APMCALLS\apmcalls.lib
     67   @%write $(OBJDIR)\$(NAME).lrf library $(%WATCOM)\lib286\plibs.lib
    13368
    134 $(NAME).sys: $(OBJS) $(NAME).lrf makefile.os2 $(%DDK)\BASE\lib\os2286.lib ..\runtime\runtime.lib $(%DDK)\BASE\src\dev\resource\rmcalls\rmcalls.lib
    135    $(LINK) @$(NAME).lrf
    136    copy $(NAME).sys ..\bin
     69$(OBJDIR)\$(NAME).sys: $(OBJS) $(OBJDIR)\$(NAME).lrf makefile.os2 $(%DDK)\BASE\lib\os2286.lib $(SBLIVE_LIB)\runtime.lib $(%DDK)\BASE\src\dev\resource\rmcalls\rmcalls.lib
     70   $(LINK) @$(OBJDIR)\$(NAME).lrf
     71   copy $(OBJDIR)\$(NAME).sys ..\bin
    13772
    138 $(NAME).sym: $(WMAPNAME)
    139    wat2map $(WMAPNAME) $(NAME).MAP
     73$(OBJDIR)\$(NAME).sym: $(OBJDIR)\$(WMAPNAME)
     74   $(WAT2MAP) $(OBJDIR)\$(WMAPNAME) $(OBJDIR)\$(NAME).MAP
     75   cd $(OBJDIR)
    14076   mapsym $(NAME).MAP
    141    copy $(NAME).sym ..\bin
     77   cd ..\..
     78   copy $(OBJDIR)\$(NAME).sym ..\bin
    14279
    14380clean:

  • sbliveos2/trunk/drv32/makefile.os2

    r152 r174  
    2020#
    2121#******************************************************************************
     22
    2223!include ..\include\version.mak
    2324
    24 INC    = .;$(%WATCOM)\H;..\runtime;..\include;$(%DDK)\base\h
    25 INCA    = -I:$(%DDK)\BASE\INC
     25CINCLUDES = .;$(%WATCOM)\H;..\runtime;..\include;$(%DDK)\base\h
     26AINCLUDES = -I:$(%DDK)\BASE\INC
    2627
    27 #===================================================================
    28 #
    29 #   Auto-dependency information
    30 #
    31 #===================================================================
    32 .ERASE
    33 .SUFFIXES:
    34 .SUFFIXES: .lst .obj .lib .cpp .c .asm .def
     28LNKFILE = $(OBJDIR)\sblive32.lnk
    3529
    36 !if "$(DEBUG)" == "1"
    37 CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    38 ASFLAGS = -Mb -Li -Sv:M510
    39 !else
    40 CFLAGS  = -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    41 ASFLAGS = -Mb -Li -Sv:M510
    42 !endif
    43 
    44 !if "$(KEE)" == "1"
    45 CFLAGS  = $(CFLAGS) -mf -DKEE
    46 ASFLAGS = $(ASFLAGS) -D:KEE
    47 LNKFILE = sblivekee.lnk
    48 !else
    49 CFLAGS  = $(CFLAGS) -mc -zu
    50 LNKFILE = sblive.lnk
    51 !endif
    52 
    53 CC      = WPP386 $(CFLAGS) $(IWC)
    54 ASM     = alp $(ASFLAGS) $(INCA)
    55 
    56 DFLAGS  = -l -s
    57 DIS     = WDISASM $(DFLAGS)
    58 
    59 !if "$(DEBUG)" == "1"
    60 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    61 !else
    62 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global
    63 !endif
    64 QFLAGS  = system os2 option quiet, map, align=512
    65 LINK    = WLINK $(LFLAGS)
    66 
    67 BFLAGS  = -s -t -c -b -q -n
    68 LIB     = WLIB $(BFLAGS)
    69 
    70 IFLAGS  = /nologo
    71 IMPLIB  = IMPLIB $(IFLAGS)
    72 
    73 .obj.lst:
    74         $(DIS) $*
    75 
    76 .c.obj: .AUTODEPEND
    77         $(CC) $*.c
    78 
    79 .cpp.obj: .AUTODEPEND
    80         $(CC) $*.cpp
    81 
    82 .asm.obj: .AUTODEPEND
    83         $(ASM) $*.asm -Fl:$*.lst
    84 
    85 .def.lib:
    86         $(IMPLIB) $*.lib $*.def
     30EVERYTHING_AS_CPP=1
     3132BIT=1
     32!include ..\makefile.inc
     33!include ..\include\sblive32.mak
    8734
    8835#===================================================================
    … …  
    9441FILE2    = strategy.obj
    9542FILE3    = init.obj
    96 FILE4    = impmvdm.lib devhlp.obj
     43FILE4    = devhlp.obj
    9744FILE5    = idc.obj dispatch.obj
    9845FILE6    = impdos.lib
    … …  
    10047FILE7    = impkee.lib
    10148!endif
    102 FILE8    = ..\sblive\sblive32.lib ..\lib32\linuxlib.lib
     49FILE8    = impmvdm.lib
    10350FILELAST = end.obj
    10451FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILELAST)
     52
    10553TARGET   = sblive32
    106 WMAPNAME = sblive32.wmap
     54WMAPNAME = $(OBJDIR)\sblive32.wmap
    10755
    10856
    … …  
    11361#
    11462#===================================================================
    115 all: $(TARGET).sys
     63all: $(OBJDIR)\$(TARGET).sys
    11664
    11765$(LNKFILE): makefile.os2 ..\include\version.mak
    118     @%write $^@ name $(TARGET).sys
    11966    @%write $^@ option alignment=16
    12067    @%write $^@ option description '@$#$(_VENDOR):$(_VERSION)$#@'
    12168    @%write $^@ option map=$(WMAPNAME)
    122     @for %f in ($(FILES)) do @%append $^@ file %f
    123 #!if "$(KEE)" == "1"
     69# why the @#$@#$!@$ doesn't this work here?????????????????????/
     70#    @%write $^@ name $(OBJDIR)\$(TARGET).sys
     71    @%write $^@ name $(TARGET).sys
     72    @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
    12473    @%write $^@ import DOSIODELAYCNT DOSCALLS.427
    125 #!endif
     74!if "$(KEE)" == "1"
     75    @%write $^@ library $(SBLIVE_LIB)\sblive32kee.lib
     76    @%write $^@ library $(SBLIVE_LIB)\linuxlibkee.lib
     77!else
     78    @%write $^@ library $(SBLIVE_LIB)\sblive32.lib
     79    @%write $^@ library $(SBLIVE_LIB)\linuxlib.lib
     80!endif
    12681    @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib
    12782
    128 $(TARGET).sys: $(LNKFILE) $(FILES)
     83$(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES)
    12984     $(LINK) @$(LNKFILE)
    130      ..\drv16\wat2map $(WMAPNAME) $(TARGET).MAP
     85     $(WAT2MAP) $(WMAPNAME) $(OBJDIR)\$(TARGET).MAP
     86     cd $(OBJDIR)
    13187     mapsym $(TARGET).MAP
    132      copy $(TARGET).sys ..\bin
     88     cd ..\..
     89#     copy $(TARGET).sys $(OBJDIR)\$(TARGET).sys
     90     copy sblive32.sys bin\releasekee
    13391!ifdef KEE
    134      copy $(TARGET).sys ..\bin\$(TARGET)kee.sys
     92     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)kee.sys
    13593!else
    136      copy $(TARGET).sys ..\bin\$(TARGET)w4.sys
     94     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)w4.sys
    13795!endif
    138      copy $(TARGET).sym ..\bin
     96     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)
    13997
    14098clean:
     99     cd $(OBJDIR)
    141100     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    142    
     101     cd ..

  • sbliveos2/trunk/lib32/makefile.os2

    r148 r174  
    1 INC    = $(%WATCOM)\H;..\include;..\runtime;..\sblive
    2 INCA    = $(%DDK)\BASE\H
     1CINCLUDES = $(%WATCOM)\H;..\include;..\runtime;..\sblive
     2AINCLUDES = $(%DDK)\BASE\H
    33
    4 #===================================================================
    5 #
    6 #   Auto-dependency information
    7 #
    8 #===================================================================
    9 .ERASE
    10 .SUFFIXES:
    11 .SUFFIXES: .lst .obj .cpp .c .asm
     4CDEFINES = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2
    125
    13 !if "$(DEBUG)" == "1"
    14 CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    15 !else
    16 CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    17 !endif
     632BIT=1
     7!include ..\makefile.inc
     8!include ..\include\sblive32.mak
    189
    19 ASFLAGS = -Mb -Li -Sv:ALP
    20 
    21 !if "$(KEE)" == "1"
    22 CFLAGS  = $(CFLAGS) -mf -DKEE
    23 ASFLAGS = $(ASFLAGS) -D:KEE
    24 !else
    25 CFLAGS  = $(CFLAGS) -mc -zu
    26 !endif
    27 
    28 CC      = WCC386 $(CFLAGS) $(IWC)
    29 CPP     = WPP386 $(CFLAGS) $(IWC)
    30 ASM     = alp $(ASFLAGS) $(INCA)
    31 
    32 DFLAGS  = -l -s
    33 DIS     = WDISASM $(DFLAGS)
    34 
    35 !if "$(DEBUG)" == "1"
    36 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    37 !else
    38 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global
    39 !endif
    40 QFLAGS  = system os2 option quiet, map, align=512
    41 LINK    = WLINK $(LFLAGS)
    42 
    43 BFLAGS  = -c -b -q -n
    44 LIB     = WLIB $(BFLAGS)
    45 
    46 .obj.lst:
    47         $(DIS) $*
    48 
    49 .cpp.obj: .AUTODEPEND
    50         $(CPP) $*.cpp
    51 
    52 .c.obj: .AUTODEPEND
    53         $(CC) $*.c
    54 
    55 .asm.obj: .AUTODEPEND
    56         $(ASM) $*.asm -Fl:$*.lst
    5710
    5811#===================================================================
    … …  
    7124FILELAST =
    7225FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
     26
     27!if "$(KEE)" == "1"
     28TARGET   = linuxlibkee
     29!else
    7330TARGET   = linuxlib
     31!endif
    7432
     33LNKFILE  = $(OBJDIR)\$(TARGET).lnk
    7534
    7635
    … …  
    8039#
    8140#===================================================================
    82 all: $(TARGET).lib
     41all: $(OBJDIR)\$(TARGET).lib
    8342
    8443
    85 $(TARGET).lnk: makefile.os2
    86     @%create $(TARGET).lnk
    87     @for %f in ($(FILES)) do @%append $(TARGET).lnk -+%f
     44$(LNKFILE): makefile.os2
     45    @%create $(LNKFILE)
     46    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
    8847
    89 $(TARGET).lib: $(TARGET).lnk $(FILES)
    90     $(LIB) $(TARGET).lib @$(TARGET).lnk
     48$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
     49    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
     50    copy $(OBJDIR)\$(TARGET).lib $(SBLIVE_LIB)
     51
    9152
    9253clean:
     54     cd $(OBJDIR)
    9355     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
     56     cd ..

  • sbliveos2/trunk/runtime/makefile.os2

    r148 r174  
    1616   set PATH=$(%DDK)\BASE\TOOLS;$(%WATCOM)\BINP;$(%WATCOM)\BINW
    1717
    18 H=$(%DDK)\base\h
     18INCLUDE=$(%DDK)\base\h
    1919INC=$(%DDK)\base\src\inc
    2020
    21 # Options for Watcom 16-bit C compiler
    22 #  -bt=os2   = Build target OS is OS/2
    23 #  -ms       = Memory model small
    24 #  -3        = Enable use of 80386 instructions
    25 #  -4        = Optimize for 486 (assumes -3)
    26 #  -5        = Optimize for Pentium (assumes -3)
    27 #  -d1       = Include line number info in object
    28 #              (necessary to produce assembler listing)
    29 #  -o        = Optimization - i = enable inline intrinsic functions
    30 #                             r = optimize for 80486 and pentium pipes
    31 #                             s = space is preferred to time
    32 #                             l = enable loop optimizations
    33 #                             a = relax aliasing constraints
    34 #                             n = allow numerically unstable optimizations
    35 #  -s        = Omit stack size checking from start of each function
    36 #  -zl       = Place no library references into objects
    37 #  -wx       = Warning level set to maximum (vs 1..4)
    38 #  -zfp      = Prevent use of FS selector
    39 #  -zgp      = Prevent use of GS selector
    40 #  -zq       = Operate quietly
    41 #  -zm       = Put each function in its own segment
    42 #  -zu       = Do not assume that SS contains segment of DGROUP
    43 #
    44 CC=wcc
    45 CPP=wpp
    46 !if "$(DEBUG)" == "0"
    47 CFLAGS=-ms -4 -bt=os2 -olinars -s -wx -zl -zfp -zgp -zq -zu -zm
    48 !else
    49 CFLAGS=-ms -4 -bt=os2 -d1 -olinars -s -wx -zl -zfp -zgp -zq -zu -zm -DDEBUG
    50 !endif
    51 CINC=-i$(%WATCOM)\H;$(%WATCOM)\H\SYS;$(H)
    52 
    53 # Options for Watcom assembler
    54 #  -bt=os2   = Build target OS is OS/2
    55 #  -d1       = Include line number info in object
    56 #              (necessary to produce assembler listing)
    57 #  -i        = Include list
    58 #  -zq       = Operate quietly
    59 #
    60 ASM=wasm
    61 AFLAGS=-bt=os2 -d1 -zq
    62 AINC=-i$(INC)
    63 
    64 # Inference rules
    65 .c.obj: .AUTODEPEND
    66      $(CC) $(CFLAGS) $(CINC) $*.c
    67      wdisasm -l -s $*
    68 
    69 .cpp.obj: .AUTODEPEND
    70      $(CPP) $(CFLAGS) $(CINC) $*.cpp
    71      wdisasm -l -s $*
    72 
    73 .asm.obj: .AUTODEPEND
    74      $(ASM) $(AFLAGS) $(AINC) $*.asm
    75      wdisasm -l -s $*
     21!include ..\makefile.inc
     22!include ..\include\sblive16.mak
    7623
    7724# Object file list
    … …  
    8027OBJS=$(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6)
    8128
    82 all: $(NAME).lib
     29all: $(OBJDIR)\$(NAME).lib
    8330
    8431##################################
    … …  
    8633##################################
    8734
    88 $(NAME).lrf: makefile.os2
    89    @%write $^@ $(NAME).lib
    90    @for %f in ($(OBJS)) do @%append $^@ -+ %f
     35$(OBJDIR)\$(NAME).lrf: makefile.os2
     36   @%write $^@ $(OBJDIR)\$(NAME).lib
     37   @for %f in ($(OBJS)) do @%append $^@ -+ $(OBJDIR)\%f
    9138
    92 $(NAME).lib: $(OBJS) makefile.os2 $(NAME).lrf
    93    wlib @$(NAME).lrf
     39$(OBJDIR)\$(NAME).lib: $(OBJS) makefile.os2 $(OBJDIR)\$(NAME).lrf
     40   wlib @$(OBJDIR)\$(NAME).lrf
     41   copy $(OBJDIR)\$(NAME).lib $(SBLIVE_LIB)
    9442
    9543clean:
     44     cd $(OBJDIR)
    9645     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf *.lib
     46     cd ..\..
     47

  • sbliveos2/trunk/sblive/hwaccess.h

    r142 r174  
    8989#endif
    9090
    91 #define ERROR() DebugInt3()
     91#define ERROR() _asm int 3
    9292#else
    9393#define DPD 1 ? (void)0 : (void)((int (*)(int, char *, ...)) NULL)

  • sbliveos2/trunk/sblive/makefile.os2

    r148 r174  
    1 INC     = $(%WATCOM)\H;..\include;..\runtime
    2 INCA    = $(%DDK)\BASE\H
     1CINCLUDES = $(%WATCOM)\H;..\include;..\runtime;..\sblive
     2AINCLUDES = $(%DDK)\BASE\H
    33
    4 #===================================================================
    5 #
    6 #   Auto-dependency information
    7 #
    8 #===================================================================
    9 .ERASE
    10 .SUFFIXES:
    11 .SUFFIXES: .lst .obj .c .asm
     4CDEFINES = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2
    125
    13 !if "$(DEBUG)" == "1"
    14 CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    15 !else
    16 CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    17 !endif
     632BIT=1
     7!include ..\makefile.inc
     8!include ..\include\sblive32.mak
    189
    19 ASFLAGS = -Mb -Li -Sv:ALP
    20 
    21 !if "$(KEE)" == "1"
    22 CFLAGS = $(CFLAGS) -mf -DKEE
    23 ASFLAGS= $(ASFLAGS) -D:KEE
    24 !else
    25 CFLAGS = $(CFLAGS) -mc -zu
    26 !endif
    27 
    28 CC      = WCC386 $(CFLAGS) $(IWC)
    29 ASM     = alp $(ASFLAGS) $(INCA)
    30 
    31 DFLAGS  = -l -s
    32 DIS     = WDISASM $(DFLAGS)
    33 
    34 !if "$(DEBUG)" == "1"
    35 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global d codeview
    36 !else
    37 LFLAGS  = system os2v2 physdevice option int, dosseg, map, eliminate, mang, tog sort global
    38 !endif
    39 QFLAGS  = system os2 option quiet, map, align=512
    40 LINK    = WLINK $(LFLAGS)
    41 
    42 BFLAGS  = -c -b -q -n
    43 LIB     = WLIB $(BFLAGS)
    44 
    45 .obj.lst:
    46         $(DIS) $*
    47 
    48 .c.obj: .AUTODEPEND
    49         $(CC) $*.c
    50 
    51 .asm.obj: .AUTODEPEND
    52         $(ASM) $*.asm -Fl:$*.lst
    5310
    5411#===================================================================
    … …  
    6724FILELAST =
    6825FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
     26
     27!if "$(KEE)" == "1"
     28TARGET   = sblive32kee
     29!else
    6930TARGET   = sblive32
     31!endif
    7032
     33LNKFILE  = $(OBJDIR)\$(TARGET).lnk
    7134
    7235
    … …  
    7639#
    7740#===================================================================
    78 all: $(TARGET).lib
     41all: $(OBJDIR)\$(TARGET).lib
    7942
    8043
    81 $(TARGET).lnk: makefile.os2
    82     @%create $(TARGET).lnk
    83     @for %f in ($(FILES)) do @%append $(TARGET).lnk -+%f
     44$(LNKFILE): makefile.os2
     45    @%create $(LNKFILE)
     46    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
    8447
    85 $(TARGET).lib: $(TARGET).lnk $(FILES)
    86     $(LIB) $(TARGET).lib @$(TARGET).lnk
     48$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
     49    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
     50    copy $(OBJDIR)\$(TARGET).lib $(SBLIVE_LIB)
     51
    8752
    8853clean:
     54     cd $(OBJDIR)
    8955     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
     56     cd ..
Note: See TracChangeset for help on using the changeset viewer.