Changeset 580


Ignore:
Timestamp:
Jul 9, 2014, 9:59:13 PM (11 years ago)
Author:
David Azarewicz
Message:

Cleanup build environment

Location:
GPL/branches/DAZ
Files:
4 added
59 deleted
8 edited
35 moved

Legend:

Unmodified
Added
Removed
  • GPL/branches/DAZ/!clean.cmd

    r86 r580  
    1 @echo off
    2 SET KEE=0
    3 wmake -ms -f makefile.os2 DEBUG=1 clean
    4 SET KEE=1
    5 wmake -ms -f makefile.os2 DEBUG=1 clean
    6 SET KEE=
     1wmake clean
    72
  • GPL/branches/DAZ/alsa-kernel/Makefile

    r579 r580  
    1 LOGO=-h
    2 
    3 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
     1WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    42
    53#===================================================================
     
    119
    1210subdirs: .SYMBOLIC
    13     @echo BUILDING core
    14     @cd core
    15     @wmake $(NMAKEOPTS)
    16     @cd ..
    17     @echo BUILDING drivers
    18     @cd drivers
    19     @wmake $(NMAKEOPTS)
    20     @cd ..
    21     @echo BUILDING isa
    22     @cd isa
    23     @wmake $(NMAKEOPTS)
    24     @cd ..
    25     @echo BUILDING pci
    26     @cd pci
    27     @wmake $(NMAKEOPTS)
    28     @cd ..
    29     @echo BUILDING synth
    30     @cd synth
    31     @wmake $(NMAKEOPTS)
    32     @cd ..
     11  @echo BUILDING core
     12  @cd core
     13  @wmake $(WMAKEOPTS)
     14  @cd ..
     15  @echo BUILDING drivers
     16  @cd drivers
     17  @wmake $(WMAKEOPTS)
     18  @cd ..
     19  @echo BUILDING isa
     20  @cd isa
     21  @wmake $(WMAKEOPTS)
     22  @cd ..
     23  @echo BUILDING pci
     24  @cd pci
     25  @wmake $(WMAKEOPTS)
     26  @cd ..
     27  @echo BUILDING synth
     28  @cd synth
     29  @wmake $(WMAKEOPTS)
     30  @cd ..
    3331
    3432clean: .SYMBOLIC
    35     @echo CLEANING core
    36     @cd core
    37     @wmake $(NMAKEOPTS) clean
    38     @cd ..
    39     @echo CLEANING drivers
    40     @cd drivers
    41     @wmake $(NMAKEOPTS) clean
    42     @cd ..
    43     @echo CLEANING isa
    44     @cd isa
    45     @wmake $(NMAKEOPTS) clean
    46     @cd ..
    47     @echo CLEANING pci
    48     @cd pci
    49     @wmake $(NMAKEOPTS) clean
    50     @cd ..
    51     @echo CLEANING synth
    52     @cd synth
    53     @wmake $(NMAKEOPTS) clean
    54     @cd ..
     33  @echo CLEANING core
     34  @cd core
     35  @wmake $(WMAKEOPTS) clean
     36  @cd ..
     37  @echo CLEANING drivers
     38  @cd drivers
     39  @wmake $(WMAKEOPTS) clean
     40  @cd ..
     41  @echo CLEANING isa
     42  @cd isa
     43  @wmake $(WMAKEOPTS) clean
     44  @cd ..
     45  @echo CLEANING pci
     46  @cd pci
     47  @wmake $(WMAKEOPTS) clean
     48  @cd ..
     49  @echo CLEANING synth
     50  @cd synth
     51  @wmake $(WMAKEOPTS) clean
     52  @cd ..
  • GPL/branches/DAZ/alsa-kernel/core/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\include;..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
     13WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1014
    1115#===================================================================
     
    1418#
    1519#===================================================================
    16 FILE1    = sound.obj init.obj memory.obj memalloc.obj sgbuf.obj
    17 FILE2    = control.obj device.obj misc.obj
    18 FILE3    = sound_oss.obj info_oss.obj
    19 FILE4    = pcm.obj pcm_native.obj pcm_lib.obj pcm_misc.obj pcm_timer.obj pcm_memory.obj
    20 FILE5    = rawmidi.obj
    21 FILE6    = timer.obj
    22 FILE7    = rtctimer.obj
    23 FILE8    = hwdep.obj info.obj vmaster.obj
    24 FILELAST =
    25 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     20FILES = sound.obj init.obj memory.obj memalloc.obj sgbuf.obj &
     21  control.obj device.obj misc.obj &
     22  sound_oss.obj info_oss.obj &
     23  pcm.obj pcm_native.obj pcm_lib.obj pcm_misc.obj pcm_timer.obj pcm_memory.obj &
     24  rawmidi.obj timer.obj rtctimer.obj hwdep.obj info.obj vmaster.obj
    2625
    27 TARGET   = core
     26TARGET = core
    2827
    29 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
    30 
     28LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3129
    3230#===================================================================
     
    3735all: $(OBJDIR)\$(TARGET).lib subdirs
    3836
    39 
    40 $(LNKFILE): makefile.os2
     37$(LNKFILE): Makefile
    4138    @%create $(LNKFILE)
    4239    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    5047    @echo BUILDING seq
    5148    @cd seq
    52     @wmake $(NMAKEOPTS)
     49    @wmake $(WMAKEOPTS)
    5350    @cd ..
    5451    @echo BUILDING oss
    5552    @cd oss
    56     @wmake $(NMAKEOPTS)
     53    @wmake $(WMAKEOPTS)
    5754    @cd ..
    5855
     
    6057    @echo CLEANING seq
    6158    @cd seq
    62     @wmake $(NMAKEOPTS) clean
     59    @wmake $(WMAKEOPTS) clean
    6360    @cd ..
    6461    @echo CLEARING oss
    6562    @cd oss
    66     @wmake $(NMAKEOPTS) clean
     63    @wmake $(WMAKEOPTS) clean
    6764    @cd ..
    6865    -@rm *.err
    69     @cd $(OBJDIR)
    70     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    71     @cd ..\..
     66    @if exist obj @rm.exe -r obj
     67    @if exist bin @rm.exe -r bin
     68
  • GPL/branches/DAZ/alsa-kernel/core/oss/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     13WMAKEOPTS=-h $(__MAKEOPTS__)
    1014
    1115!if "$(DEBUG)" == "1"
    12 NMAKEOPTS += DEBUG=1
     16WMAKEOPTS += DEBUG=1
    1317!endif
    1418
    1519!if "$(KEE)" == "0"
    16 NMAKEOPTS += KEE=0
     20WMAKEOPTS += KEE=0
    1721KEE=0
    1822!else
    19 NMAKEOPTS += KEE=1
     23WMAKEOPTS += KEE=1
    2024KEE=1
    21 !endif
    22 
    23 !if "$(DEBUG)" == "1"
    24 !Message BUILDING DEBUG VERSION
    25 !else
    26 !Message BUILDING RELEASE VERSION
    2725!endif
    2826
     
    3230#
    3331#===================================================================
    34 FILE1    = pcm_oss.obj
    35 FILE2    =
    36 FILE3    =
    37 FILE4    =
    38 FILE5    =
    39 FILELAST =
    40 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     32FILES    = pcm_oss.obj
    4133
    4234TARGET   = core_oss
     
    5345
    5446
    55 $(LNKFILE): makefile.os2
     47$(LNKFILE): Makefile
    5648    @%create $(LNKFILE)
    5749    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    6456#    @echo BUILDING instr
    6557#    @cd instr
    66 #    @wmake $(NMAKEOPTS)
     58#    @wmake $(WMAKEOPTS)
    6759#    @cd ..
    6860
     
    7062#    @echo BUILDING instr
    7163#    @cd instr
    72 #    @wmake $(NMAKEOPTS) clean
     64#    @wmake $(WMAKEOPTS) clean
    7365#    @cd ..
    7466    -@rm *.err
    75     @cd $(OBJDIR)
    76     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    77     @cd ../..
     67    @if exist obj @rm.exe -r obj
     68    @if exist bin @rm.exe -r bin
     69
  • GPL/branches/DAZ/alsa-kernel/core/seq/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
     13WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1014
    1115#===================================================================
     
    1418#
    1519#===================================================================
    16 FILE1    = seq_device.obj
    17 FILE2    = seq.obj seq_lock.obj seq_clientmgr.obj seq_memory.obj seq_queue.obj
    18 FILE3    = seq_fifo.obj seq_prioq.obj seq_timer.obj
    19 FILE4    = seq_system.obj seq_ports.obj seq_info.obj
    20 FILE5    = seq_midi.obj seq_midi_emul.obj seq_midi_event.obj seq_dummy.obj seq_virmidi.obj
    21 FILELAST =
    22 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     20FILES = seq_device.obj &
     21  seq.obj seq_lock.obj seq_clientmgr.obj seq_memory.obj seq_queue.obj &
     22  seq_fifo.obj seq_prioq.obj seq_timer.obj &
     23  seq_system.obj seq_ports.obj seq_info.obj &
     24  seq_midi.obj seq_midi_emul.obj seq_midi_event.obj seq_dummy.obj seq_virmidi.obj
    2325
    2426TARGET   = sequencer
     
    3537
    3638
    37 $(LNKFILE): makefile.os2
     39$(LNKFILE): Makefile
    3840    @%create $(LNKFILE)
    3941    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4648#    @echo BUILDING oss
    4749#    @cd oss
    48 #    @wmake $(NMAKEOPTS)
     50#    @wmake $(WMAKEOPTS)
    4951#    @cd ..
    5052
     
    5254#    @echo BUILDING oss
    5355#    @cd oss
    54 #    @wmake $(NMAKEOPTS) clean
     56#    @wmake $(WMAKEOPTS) clean
    5557#    @cd ..
    56     -@rm *.err 
    57     @cd $(OBJDIR)
    58     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    59     @cd ../..
     58    -@rm *.err
     59    @if exist obj @rm.exe -r obj
     60    @if exist bin @rm.exe -r bin
     61
  • GPL/branches/DAZ/alsa-kernel/core/seq/oss/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\..\include;..\..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO)
     13WMAKEOPTS=-h $(__MAKEOPTS__)
    1014
    1115!if "$(DEBUG)" == "1"
    12 NMAKEOPTS += DEBUG=1
     16WMAKEOPTS += DEBUG=1
    1317!endif
    1418
    1519!if "$(KEE)" == "0"
    16 NMAKEOPTS += KEE=0
     20WMAKEOPTS += KEE=0
    1721KEE=0
    1822!else
    19 NMAKEOPTS += KEE=1
     23WMAKEOPTS += KEE=1
    2024KEE=1
    21 !endif
    22 
    23 !if "$(DEBUG)" == "1"
    24 !Message BUILDING DEBUG VERSION
    25 !else
    26 !Message BUILDING RELEASE VERSION
    2725!endif
    2826
     
    3230#
    3331#===================================================================
    34 FILE1    = seq_oss.obj seq_oss_init.obj seq_oss_timer.obj seq_oss_ioctl.obj
    35 FILE2    = seq_oss_event.obj seq_oss_rw.obj seq_oss_synth.obj
    36 FILE3    = seq_oss_midi.obj seq_oss_readq.obj seq_oss_writeq.obj
    37 FILE4    =
    38 FILE5    =
    39 FILELAST =
    40 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     32FILES = seq_oss.obj seq_oss_init.obj seq_oss_timer.obj seq_oss_ioctl.obj &
     33  seq_oss_event.obj seq_oss_rw.obj seq_oss_synth.obj &
     34  seq_oss_midi.obj seq_oss_readq.obj seq_oss_writeq.obj
    4135
    4236TARGET   = seq-oss
     
    5347
    5448
    55 $(LNKFILE): makefile.os2
     49$(LNKFILE): Makefile
    5650    @%create $(LNKFILE)
    5751    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    6458#    @echo BUILDING instr
    6559#    @cd instr
    66 #    @wmake $(NMAKEOPTS)
     60#    @wmake $(WMAKEOPTS)
    6761#    @cd ..
    6862
     
    7064#    @echo BUILDING instr
    7165#    @cd instr
    72 #    @wmake $(NMAKEOPTS) clean
     66#    @wmake $(WMAKEOPTS) clean
    7367#    @cd ..
    7468    -@rm *.err
    75     @cd $(OBJDIR)
    76     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    77     @cd ../..
     69    @if exist obj @rm.exe -r obj
     70    @if exist bin @rm.exe -r bin
     71
  • GPL/branches/DAZ/alsa-kernel/drivers/Makefile

    r579 r580  
    1 CINCLUDES = ..\..\include;..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
    35
    4 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
     6NOOBJ=1
     7!include $(ROOT)\tools\header.mif
    58
    6 32BIT=1
    7 !include ..\..\makefile.inc
     9WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    810
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    10 
    11 #===================================================================
    12 #
    13 #   List of source files
    14 #
    15 #===================================================================
    16 #FILE1    = dummy.obj virmidi.obj serial-u16550.obj
    17 FILE1    =
    18 FILE2    =
    19 FILE3    =
    20 FILE4    =
    21 FILE5    =
    22 FILE6    =
    23 FILE7    =
    24 FILE8    =
    25 FILELAST =
    26 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
    27 
    28 TARGET   = drivers
    29 
    30 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
    31 
    32 
    33 #===================================================================
    34 #
    35 #   Specific dependencies
    36 #
    37 #===================================================================
    38 all: $(OBJDIR)\$(TARGET).lib subdirs
    39 
    40 $(LNKFILE): makefile.os2
    41     @%create $(LNKFILE)
    42     @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
    43 
    44 $(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    45     $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    46     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
     11all: subdirs
    4712
    4813subdirs: .SYMBOLIC
    4914    @echo BUILDING opl3
    5015    @cd opl3
    51     @wmake $(NMAKEOPTS)
     16    @wmake $(WMAKEOPTS)
    5217    @cd ..
    5318    @echo BUILDING mpu401
    5419    @cd mpu401
    55     @wmake $(NMAKEOPTS)
     20    @wmake $(WMAKEOPTS)
    5621    @cd ..
    5722
     
    5924    @echo CLEANING opl3
    6025    @cd opl3
    61     @wmake $(NMAKEOPTS) clean
     26    @wmake $(WMAKEOPTS) clean
    6227    @cd ..
    6328    @echo CLEANING mpu401
    6429    @cd mpu401
    65     @wmake $(NMAKEOPTS) clean
     30    @wmake $(WMAKEOPTS) clean
    6631    @cd ..
    67     -@rm  *.err
    68     @cd $(OBJDIR)
    69     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    70     @cd ../..
     32    @if exist obj @rm.exe -r obj
     33    @if exist bin @rm.exe -r bin
     34
  • GPL/branches/DAZ/alsa-kernel/drivers/mpu401/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = mpu401.obj mpu401_uart.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = mpu401.obj mpu401_uart.obj
    2520
    2621TARGET   = mpu401
     
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4742
    4843clean: .SYMBOLIC
    49     -@rm  *.err 
    50     @cd $(OBJDIR)
    51     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    52     @cd ../..
     44    -@rm  *.err
     45    @if exist obj @rm.exe -r obj
     46    @if exist bin @rm.exe -r bin
     47
  • GPL/branches/DAZ/alsa-kernel/drivers/opl3/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    =
    16 FILE2    = opl3_lib.obj opl3_synth.obj
    17 FILE3    = opl3_seq.obj opl3_midi.obj opl3_drums.obj
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = opl3_lib.obj opl3_synth.obj &
     20  opl3_seq.obj opl3_midi.obj opl3_drums.obj
    2521
    2622TARGET   = opl3
     
    3733
    3834
    39 $(LNKFILE): makefile.os2
     35$(LNKFILE): Makefile
    4036    @%create $(LNKFILE)
    4137    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4743
    4844clean: .SYMBOLIC
    49      -@rm  *.err
    50      @cd $(OBJDIR)
    51      -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    52      @cd ../..
     45  -@rm  *.err
     46  @if exist obj @rm.exe -r obj
     47  @if exist bin @rm.exe -r bin
     48
  • GPL/branches/DAZ/alsa-kernel/isa/Makefile

    r579 r580  
    1 CINCLUDES = ..\..\include;..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
    35
    4 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
     6NOOBJ=1
     7!include $(ROOT)\tools\header.mif
    58
    6 32BIT=1
    7 !include ..\..\makefile.inc
    8 
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
    10 
    11 #===================================================================
    12 #
    13 #   List of source files
    14 #
    15 #===================================================================
    16 FILE1    =
    17 FILE2    =
    18 FILE3    =
    19 FILE4    =
    20 FILE5    =
    21 FILE6    =
    22 FILE7    =
    23 FILE8    =
    24 FILELAST =
    25 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
    26 
    27 TARGET   = isa
    28 
    29 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     9WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    3010
    3111
    32 #===================================================================
    33 #
    34 #   Specific dependencies
    35 #
    36 #===================================================================
    37 all: $(OBJDIR)\$(TARGET).lib subdirs
    38 
    39 
    40 $(LNKFILE): makefile.os2
    41     @%create $(LNKFILE)
    42     @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
    43 
    44 $(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    45     $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    46     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    47 
     12all: subdirs
    4813
    4914subdirs: .SYMBOLIC
    5015#    @echo BUILDING ad1816a
    5116#    @cd ad1816a
    52 #    @wmake $(NMAKEOPTS)
     17#    @wmake $(WMAKEOPTS)
    5318#    @cd ..
    5419#    @echo BUILDING ad1848
    5520#    @cd ad1848
    56 #    @wmake $(NMAKEOPTS)
     21#    @wmake $(WMAKEOPTS)
    5722#    @cd ..
    5823#    @echo BUILDING cs423x
    5924#    @cd cs423x
    60 #    @wmake $(NMAKEOPTS)
     25#    @wmake $(WMAKEOPTS)
    6126#    @cd ..
    6227#    @echo BUILDING es1688
    6328#    @cd es1688
    64 #    @wmake $(NMAKEOPTS)
     29#    @wmake $(WMAKEOPTS)
    6530#    @cd ..
    6631#    @echo BUILDING gus
    6732#    @cd gus
    68 #    @wmake $(NMAKEOPTS)
     33#    @wmake $(WMAKEOPTS)
    6934#    @cd ..
    7035#    @echo BUILDING opti9xx
    7136#    @cd opti9xx
    72 #    @wmake $(NMAKEOPTS)
     37#    @wmake $(WMAKEOPTS)
    7338#    @cd ..
    7439    @echo BUILDING sb
    7540    @cd sb
    76     @wmake $(NMAKEOPTS)
     41    @wmake $(WMAKEOPTS)
    7742    @cd ..
    7843
     
    8045##    @echo BUILDING wavefront
    8146##    @cd wavefront
    82 ##    @nmake $(NMAKEOPTS)
     47##    @nmake $(WMAKEOPTS)
    8348##    @cd ..
    84    
     49
    8550
    8651clean: .SYMBOLIC
    8752    @echo CLEANING sb
    8853    @cd sb
    89     @wmake $(NMAKEOPTS) clean
     54    @wmake $(WMAKEOPTS) clean
    9055    @cd ..
    91     -@rm  *.err 
    92     @cd $(OBJDIR)
    93     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    94     @cd ..
     56    -@rm  *.err
     57    @if exist obj @rm.exe -r obj
     58    @if exist bin @rm.exe -r bin
     59
  • GPL/branches/DAZ/alsa-kernel/isa/ad1816a/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ad1816a_lib.obj ad1816a.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ad1816a_lib.obj ad1816a.obj
    2520
    2621TARGET   = ad1816a
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/isa/ad1848/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ad1848_lib.obj ad1848.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ad1848_lib.obj ad1848.obj
    2520
    2621TARGET   = ad1848
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/isa/cs423x/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = cs4231_lib.obj cs4236_lib.obj cs4231.obj cs4232.obj cs4236.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = cs4231_lib.obj cs4236_lib.obj cs4231.obj cs4232.obj cs4236.obj
    2520
    2621TARGET   = cs423x
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/isa/es1688/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = es1688_lib.obj es1688.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = es1688_lib.obj es1688.obj
    2520
    2621TARGET   = es1688
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/isa/gus/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = gus_main.obj gus_io.obj gus_irq.obj gus_timer.obj
    16 FILE2    = gus_mem.obj gus_mem_proc.obj gus_dram.obj gus_dma.obj gus_volume.obj
    17 FILE3    = gus_pcm.obj gus_mixer.obj gus_uart.obj gus_reset.obj
    18 FILE4    = gus_synth.obj gus_sample.obj gus_simple.obj gus_instr.obj
    19 FILE5    = gusclassic.obj gusextreme.obj gusmax.obj interwave.obj interwave-stb.obj
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = gus_main.obj gus_io.obj gus_irq.obj gus_timer.obj &
     20  gus_mem.obj gus_mem_proc.obj gus_dram.obj gus_dma.obj gus_volume.obj &
     21  gus_pcm.obj gus_mixer.obj gus_uart.obj gus_reset.obj &
     22  gus_synth.obj gus_sample.obj gus_simple.obj gus_instr.obj &
     23  gusclassic.obj gusextreme.obj gusmax.obj interwave.obj interwave-stb.obj
    2524
    26 TARGET   = gus
     25TARGET = gus
    2726
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     27LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2928
    3029
     
    3433#
    3534#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     35all: $(OBJDIR)\$(TARGET).lib
    3736
    3837
    39 $(LNKFILE): makefile.os2
     38$(LNKFILE): Makefile
    4039    @%create $(LNKFILE)
    4140    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4342$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4443    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     44    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4645
    4746clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     47    -@rm *.err
     48    @if exist obj @rm.exe -r obj
     49    @if exist bin @rm.exe -r bin
     50
  • GPL/branches/DAZ/alsa-kernel/isa/opti9xx/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = opti92x-ad1848.obj opti92x-cs4231.obj opti93x.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = opti92x-ad1848.obj opti92x-cs4231.obj opti93x.obj
    2520
    26 TARGET   = opti9xx
     21TARGET = opti9xx
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/isa/sb/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = sb_common.obj sb_mixer.obj
     19FILES = sb_common.obj sb_mixer.obj
    1620#sb8_main.obj sb8_midi.obj
    17 FILE2    =
    1821#sb16_main.obj sb16_csp.obj sb8.obj sb16.obj sbawe.obj emu8000.obj
    19 FILE3    =
    2022#emu8000_synth.obj emu8000_callback.obj emu8000_patch.obj
    21 FILE4    =
    22 # es968.obj
    23 FILE5    =
    24 FILE6    =
    25 FILE7    =
    26 FILE8    =
    27 FILELAST =
    28 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
    2923
    30 TARGET   = sb
     24TARGET = sb
    3125
    32 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     26LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3327
    3428
     
    3832#
    3933#===================================================================
    40 all: $(OBJDIR)\$(TARGET).lib 
     34all: $(OBJDIR)\$(TARGET).lib
    4135
    4236
    43 $(LNKFILE): makefile.os2
     37$(LNKFILE): Makefile
    4438    @%create $(LNKFILE)
    4539    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4741$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4842    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    49     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     43    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    5044
    5145clean: .SYMBOLIC
    52     -@rm *.err 
    53     @cd $(OBJDIR)
    54     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    55     @cd ../..
     46    -@rm *.err
     47    @if exist obj @rm.exe -r obj
     48    @if exist bin @rm.exe -r bin
     49
  • GPL/branches/DAZ/alsa-kernel/isa/wavefront/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = wavefront_fx.obj wavefront_synth.obj wavefront_midi.obj wavefront.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = wavefront_fx.obj wavefront_synth.obj wavefront_midi.obj wavefront.obj
    2520
    26 TARGET   = ad1816a
     21TARGET = ad1816a
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48      cd $(OBJDIR)
    49      -del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50      cd ..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\include;..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
     13WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1014
    1115#===================================================================
     
    1418#
    1519#===================================================================
    16 FILE1    = pci_iomap_compat.obj ens1370.obj ens1371.obj cs4281.obj  es1938.obj
    17 FILE2    = es1968.obj intel8x0.obj maestro3.obj via82xx.obj
    18 FILE3    = fm801.obj atiixp.obj cmipci.obj als4000.obj bt87x.obj
    19 FILE4    = ak4531_codec.obj cs5530.obj
    20 FILE5    =
    21 FILE6    =
    22 FILE7    =
    23 FILE8    =
    24 FILELAST =
    25 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     20FILES = pci_iomap_compat.obj ens1370.obj ens1371.obj cs4281.obj  es1938.obj &
     21  es1968.obj intel8x0.obj maestro3.obj via82xx.obj &
     22  fm801.obj atiixp.obj cmipci.obj als4000.obj bt87x.obj &
     23  ak4531_codec.obj cs5530.obj
    2624
    27 TARGET   = pci
     25TARGET = pci
    2826
    29 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     27LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3028
    3129
     
    3836
    3937
    40 $(LNKFILE): makefile.os2
     38$(LNKFILE): Makefile
    4139    @%create $(LNKFILE)
    4240    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    5048    @echo BUILDING hda
    5149    @cd hda
    52     @wmake $(NMAKEOPTS)
     50    @wmake $(WMAKEOPTS)
    5351    @cd ..
    5452    @echo BUILDING ac97
    5553    @cd ac97
    56     @wmake $(NMAKEOPTS)
     54    @wmake $(WMAKEOPTS)
    5755    @cd ..
    5856    @echo BUILDING ali5451
    5957    @cd ali5451
    60     @wmake $(NMAKEOPTS)
     58    @wmake $(WMAKEOPTS)
    6159    @cd ..
    6260    @echo BUILDING cs46xx
    6361    @cd cs46xx
    64     @wmake $(NMAKEOPTS)
     62    @wmake $(WMAKEOPTS)
    6563    @cd ..
    6664    @echo BUILDING cs5535audio
    6765    @cd cs5535audio
    68     @wmake $(NMAKEOPTS)
     66    @wmake $(WMAKEOPTS)
    6967    @cd ..
    7068    @echo BUILDING emu10k1
    7169    @cd emu10k1
    72     @wmake $(NMAKEOPTS)
     70    @wmake $(WMAKEOPTS)
    7371    @cd ..
    7472    @echo BUILDING ca0106
    7573    @cd ca0106
    76     @wmake $(NMAKEOPTS)
     74    @wmake $(WMAKEOPTS)
    7775    @cd ..
    7876    @echo BUILDING nm256
    7977    @cd nm256
    80     @wmake $(NMAKEOPTS)
     78    @wmake $(WMAKEOPTS)
    8179    @cd ..
    8280#    @echo BUILDING rme9652
    8381#    @cd rme9652
    84 #    @wmake $(NMAKEOPTS)
     82#    @wmake $(WMAKEOPTS)
    8583#    @cd ..
    8684    @echo BUILDING trident
    8785    @cd trident
    88     @wmake $(NMAKEOPTS)
     86    @wmake $(WMAKEOPTS)
    8987    @cd ..
    9088    @echo BUILDING ymfpci
    9189    @cd ymfpci
    92     @wmake $(NMAKEOPTS)
     90    @wmake $(WMAKEOPTS)
    9391    @cd ..
    9492#    @echo BUILDING vortex
    9593#    @cd au88x0
    96 #    @wmake $(NMAKEOPTS)
     94#    @wmake $(WMAKEOPTS)
    9795#    @cd ..
    9896
     
    10098##    @echo BUILDING wavefront
    10199##    @cd wavefront
    102 ##    @nmake $(NMAKEOPTS)
     100##    @nmake $(WMAKEOPTS)
    103101##    @cd ..
    104    
     102
    105103
    106104clean: .SYMBOLIC
    107105    @echo CLEANING hda
    108106    @cd hda
    109     @wmake $(NMAKEOPTS) clean
     107    @wmake $(WMAKEOPTS) clean
    110108    @cd ..
    111109    @echo CLEANING ac97
    112110    @cd ac97
    113     @wmake $(NMAKEOPTS) clean
     111    @wmake $(WMAKEOPTS) clean
    114112    @cd ..
    115113    @echo CLEANING ali5451
    116114    @cd ali5451
    117     @wmake $(NMAKEOPTS) clean
     115    @wmake $(WMAKEOPTS) clean
    118116    @cd ..
    119117    @echo CLEANING cs46xx
    120118    @cd cs46xx
    121     @wmake $(NMAKEOPTS) clean
     119    @wmake $(WMAKEOPTS) clean
    122120    @cd ..
    123121    @echo CLEANING cs5535audio
    124122    @cd cs5535audio
    125     @wmake $(NMAKEOPTS) clean
     123    @wmake $(WMAKEOPTS) clean
    126124    @cd ..
    127125    @echo CLEANING emu10k1
    128126    @cd emu10k1
    129     @wmake $(NMAKEOPTS) clean
     127    @wmake $(WMAKEOPTS) clean
    130128    @cd ..
    131129    @echo CLEANING ca0106
    132130    @cd ca0106
    133     @wmake $(NMAKEOPTS) clean
     131    @wmake $(WMAKEOPTS) clean
    134132    @cd ..
    135133#    @echo CLEANING korg1212
    136134#    @cd korg1212
    137 #    @wmake $(NMAKEOPTS) clean
     135#    @wmake $(WMAKEOPTS) clean
    138136#    @cd ..
    139137    @echo CLEANING nm256
    140138    @cd nm256
    141     @wmake $(NMAKEOPTS) clean
     139    @wmake $(WMAKEOPTS) clean
    142140    @cd ..
    143     @echo CLEANING rme9652
    144     @cd rme9652
    145     @wmake $(NMAKEOPTS) clean
    146     @cd ..
     141#    @echo CLEANING rme9652
     142#    @cd rme9652
     143#    @wmake $(WMAKEOPTS) clean
     144#    @cd ..
    147145    @echo CLEANING trident
    148146    @cd trident
    149     @wmake $(NMAKEOPTS) clean
     147    @wmake $(WMAKEOPTS) clean
    150148    @cd ..
    151149    @echo CLEANING ymfpci
    152150    @cd ymfpci
    153     @wmake $(NMAKEOPTS) clean
     151    @wmake $(WMAKEOPTS) clean
    154152    @cd ..
    155153#    @echo CLEANING vortex
    156154#    @cd au88x0
    157 #    @wmake $(NMAKEOPTS) clean
     155#    @wmake $(WMAKEOPTS) clean
    158156#    @cd ..
    159157#    @echo CLEANING wavefront
    160158#    @cd wavefront
    161 #    @nmake $(NMAKEOPTS) clean
     159#    @nmake $(WMAKEOPTS) clean
    162160#    @cd ..
    163     -@rm *.err 
    164     @cd $(OBJDIR)
    165     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    166     @cd ../..
     161    -@rm *.err
     162    @if exist obj @rm.exe -r obj
     163    @if exist bin @rm.exe -r bin
     164
  • GPL/branches/DAZ/alsa-kernel/pci/ac97/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ac97_codec.obj ac97_pcm.obj ac97_proc.obj 
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ac97_codec.obj ac97_pcm.obj ac97_proc.obj
    2520
    26 TARGET   = ac97
     21TARGET = ac97
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4641
    4742clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ../..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/ali5451/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ali5451.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ali5451.obj
    2520
    26 TARGET   = ali5451
     21TARGET = ali5451
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/au88x0/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 #FILE1    = au8810.obj au8810_core.obj au8810_pcm.obj au8810_mixer.obj au8810_mpu401.obj au8810_eq.obj
    16 FILE2    = au8820.obj au8820_core.obj au8820_pcm.obj au8820_mixer.obj au8820_mpu401.obj au8820_synth.obj
    17 #FILE3    = au8830.obj au8830_core.obj au8830_pcm.obj au8830_mixer.obj au8830_mpu401.obj au8830_eq.obj au8830_synth.obj
    18 FILE5    =
    19 FILE6    =
    20 FILE7    =
    21 FILE8    =
    22 FILELAST =
    23 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19# au8810.obj au8810_core.obj au8810_pcm.obj au8810_mixer.obj au8810_mpu401.obj au8810_eq.obj
     20FILES = au8820.obj au8820_core.obj au8820_pcm.obj au8820_mixer.obj au8820_mpu401.obj au8820_synth.obj
     21# au8830.obj au8830_core.obj au8830_pcm.obj au8830_mixer.obj au8830_mpu401.obj au8830_eq.obj au8830_synth.obj
    2422
    25 TARGET   = au88xx
     23TARGET = au88xx
    2624
    27 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     25LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2826
    2927
     
    3331#
    3432#===================================================================
    35 all: $(OBJDIR)\$(TARGET).lib 
     33all: $(OBJDIR)\$(TARGET).lib
    3634
    3735
    38 $(LNKFILE): makefile.os2
     36$(LNKFILE): Makefile
    3937    @%create $(LNKFILE)
    4038    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4240$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4341    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    44     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     42    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4543
    4644clean: .SYMBOLIC
    4745    -@rm  *.err
    48     @cd $(OBJDIR)
    49     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    50     @cd ..\..
     46    @if exist obj @rm.exe -r obj
     47    @if exist bin @rm.exe -r bin
     48
  • GPL/branches/DAZ/alsa-kernel/pci/ca0106/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ca0106_main.obj ca0106_proc.obj ca0106_mixer.obj
    16 FILE2    = ca_midi.obj
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ca0106_main.obj ca0106_proc.obj ca0106_mixer.obj &
     20  ca_midi.obj
    2521
    26 TARGET   = ca0106
     22TARGET = ca0106
    2723
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     24LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2925
    3026
     
    3430#
    3531#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     32all: $(OBJDIR)\$(TARGET).lib
    3733
    3834
    39 $(LNKFILE): makefile.os2
     35$(LNKFILE): Makefile
    4036    @%create $(LNKFILE)
    4137    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4339$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4440    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     41    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4642
    4743clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     44    -@rm *.err
     45    @if exist obj @rm.exe -r obj
     46    @if exist bin @rm.exe -r bin
     47
  • GPL/branches/DAZ/alsa-kernel/pci/cs46xx/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    4 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_ 
     9CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510#-DCONFIG_SND_CS46XX_NEW_DSP
    611
    7 32BIT=1
    8 !include ..\..\..\makefile.inc
     12!include $(ROOT)\tools\header.mif
    913
    1014
     
    1418#
    1519#===================================================================
    16 FILE1    = cs46xx.obj cs46xx_lib.obj
    17 #FILE2    = dsp_spos.obj dsp_spos_scb_lib.obj
    18 FILE3    =
    19 FILE4    =
    20 FILE5    =
    21 FILE6    =
    22 FILE7    =
    23 FILE8    =
    24 FILELAST =
    25 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     20FILES = cs46xx.obj cs46xx_lib.obj
     21# dsp_spos.obj dsp_spos_scb_lib.obj
    2622
    27 TARGET   = cs46xx
     23TARGET = cs46xx
    2824
    29 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     25LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3026
    3127
     
    3531#
    3632#===================================================================
    37 all: $(OBJDIR)\$(TARGET).lib 
     33all: $(OBJDIR)\$(TARGET).lib
    3834
    3935
    40 $(LNKFILE): makefile.os2
     36$(LNKFILE): Makefile
    4137    @%create $(LNKFILE)
    4238    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4440$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4541    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    46     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     42    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4743
    4844clean: .SYMBOLIC
    49     -@rm *.err 
    50     @cd $(OBJDIR)
    51     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    52     @cd ..\..
     45    -@rm *.err
     46    @if exist obj @rm.exe -r obj
     47    @if exist bin @rm.exe -r bin
     48
  • GPL/branches/DAZ/alsa-kernel/pci/cs5535audio/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    4 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_ 
     9CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = cs5535audio.obj cs5535audio_pcm.obj cs5535audio_pm.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = cs5535audio.obj cs5535audio_pcm.obj cs5535audio_pm.obj
    2520
    26 TARGET   = cs5535audio
     21TARGET = cs5535audio
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/emu10k1/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = emu10k1.obj emu10k1_main.obj
    16 FILE2    = irq.obj memory.obj voice.obj emumpu401.obj emupcm.obj io.obj
    17 FILE3    = emuproc.obj emumixer.obj emufx.obj
    18 FILE4    = emu10k1_synth.obj emu10k1_callback.obj emu10k1_patch.obj
    19 FILE5    = timer.obj emu10k1x.obj p16v.obj
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = emu10k1.obj emu10k1_main.obj &
     20  irq.obj memory.obj voice.obj emumpu401.obj emupcm.obj io.obj &
     21  emuproc.obj emumixer.obj emufx.obj &
     22  emu10k1_synth.obj emu10k1_callback.obj emu10k1_patch.obj &
     23  timer.obj emu10k1x.obj p16v.obj
    2524
    26 TARGET   = emu10k1
     25TARGET = emu10k1
    2726
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     27LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2928
    3029
     
    3433#
    3534#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     35all: $(OBJDIR)\$(TARGET).lib
    3736
    3837
    39 $(LNKFILE): makefile.os2
     38$(LNKFILE): Makefile
    4039    @%create $(LNKFILE)
    4140    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4342$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4443    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     44    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4645
    4746clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     47    -@rm *.err
     48    @if exist obj @rm.exe -r obj
     49    @if exist bin @rm.exe -r bin
     50
  • GPL/branches/DAZ/alsa-kernel/pci/hda/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = hda_intel.obj hda_codec.obj hda_proc.obj hda_generic.obj hda_hwdep.obj
    16 FILE2    = patch_realtek.obj patch_cmedia.obj patch_analog.obj patch_sigmatel.obj
    17 FILE3    = patch_si3054.obj patch_atihdmi.obj patch_conexant.obj patch_via.obj
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = hda_intel.obj hda_codec.obj hda_proc.obj hda_generic.obj hda_hwdep.obj &
     20  patch_realtek.obj patch_cmedia.obj patch_analog.obj patch_sigmatel.obj &
     21  patch_si3054.obj patch_atihdmi.obj patch_conexant.obj patch_via.obj
    2522
    26 TARGET   = hda
     23TARGET = hda
    2724
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     25LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2926
    3027
     
    3734
    3835
    39 $(LNKFILE): makefile.os2
     36$(LNKFILE): Makefile
    4037    @%create $(LNKFILE)
    4138    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4643
    4744clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ../..
     45    -@rm *.err
     46    @if exist obj @rm.exe -r obj
     47    @if exist bin @rm.exe -r bin
     48
  • GPL/branches/DAZ/alsa-kernel/pci/korg1212/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = korg1212.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = korg1212.obj
    2520
    26 TARGET   = korg1212
     21TARGET = korg1212
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    4843    -@rm  *.err
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/nm256/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = nm256.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = nm256.obj
    2520
    26 TARGET   = nm256
     21TARGET = nm256
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    48     -@rm *.err 
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     43    -@rm *.err
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/rme9652/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = rme9652.obj hdsp.obj hdspm.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = rme9652.obj hdsp.obj hdspm.obj
    2520
    26 TARGET   = rme9652
     21TARGET = rme9652
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    4843    -@rm *.err
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/trident/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = trident.obj trident_main.obj trident_memory.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = trident.obj trident_main.obj trident_memory.obj
    2520
    26 TARGET   = trident
     21TARGET = trident
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    4843    -@rm *.err
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/ymfpci/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = ymfpci.obj ymfpci_main.obj
    16 FILE2    =
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = ymfpci.obj ymfpci_main.obj
    2520
    26 TARGET   = ymfpci
     21TARGET = ymfpci
    2722
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     23LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2924
    3025
     
    3429#
    3530#===================================================================
    36 all: $(OBJDIR)\$(TARGET).lib 
     31all: $(OBJDIR)\$(TARGET).lib
    3732
    3833
    39 $(LNKFILE): makefile.os2
     34$(LNKFILE): Makefile
    4035    @%create $(LNKFILE)
    4136    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4338$(OBJDIR)\$(TARGET).lib: $(LNKFILE) $(FILES)
    4439    $(LIB) $(OBJDIR)\$(TARGET).lib @$(LNKFILE)
    45     copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB) 
     40    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4641
    4742clean: .SYMBOLIC
    4843    -@rm *.err
    49     @cd $(OBJDIR)
    50     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    51     @cd ..\..
     44    @if exist obj @rm.exe -r obj
     45    @if exist bin @rm.exe -r bin
     46
  • GPL/branches/DAZ/alsa-kernel/pci/ymfpci/ymfpci_main.c

    r464 r580  
    847847{
    848848        .info =                 (SNDRV_PCM_INFO_MMAP |
    849                                  SNDRV_PCM_INFO_MMAP_VALID | 
     849                                 SNDRV_PCM_INFO_MMAP_VALID |
    850850                                 SNDRV_PCM_INFO_INTERLEAVED |
    851851                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
     
    19581958 */
    19591959
    1960 static void snd_ymfpci_proc_read(struct snd_info_entry *entry, 
     1960static void snd_ymfpci_proc_read(struct snd_info_entry *entry,
    19611961                                 struct snd_info_buffer *buffer)
    19621962{
     
    21122112           covered with the kernel page allocation mechanism */
    21132113        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
    2114                                 size, &chip->work_ptr) < 0) 
     2114                                size, &chip->work_ptr) < 0)
    21152115                return -ENOMEM;
    21162116        ptr = chip->work_ptr.area;
     
    22182218#if 0
    22192219        /* FIXME: temporarily disabled, otherwise we cannot fire up
    2220          * the chip again unless reboot.  ACPI bug?
     2220         * the chip again unless reboot.
    22212221         */
    22222222        pci_set_power_state(chip->pci, 3);
  • GPL/branches/DAZ/alsa-kernel/synth/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\include;..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    9 NMAKEOPTS=-f makefile.os2 $(LOGO) ACPI=$(ACPI) KEE=$(KEE) DEBUG=$(DEBUG)
     13WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1014
    1115#===================================================================
     
    1418#
    1519#===================================================================
    16 FILE1    = util_mem.obj
    17 FILE2    =
    18 FILE3    =
    19 FILE4    =
    20 FILE5    =
    21 FILE6    =
    22 FILE7    =
    23 FILE8    =
    24 FILELAST =
    25 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     20FILES = util_mem.obj
    2621
    27 TARGET   = synth
     22TARGET = synth
    2823
    29 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     24LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3025
    3126
     
    3833
    3934
    40 $(LNKFILE): makefile.os2
     35$(LNKFILE): Makefile
    4136    @%create $(LNKFILE)
    4237    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4944    @echo BUILDING emux
    5045    @cd emux
    51     @wmake $(NMAKEOPTS)
     46    @wmake $(WMAKEOPTS)
    5247    @cd ..
    5348
     
    5550    @echo CLEANING emux
    5651    @cd emux
    57     @wmake $(NMAKEOPTS) clean
     52    @wmake $(WMAKEOPTS) clean
    5853    @cd ..
    5954    -@rm *.err
    60     @cd $(OBJDIR)
    61     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    62     @cd ..\..
     55    @if exist obj @rm.exe -r obj
     56    @if exist bin @rm.exe -r bin
     57
  • GPL/branches/DAZ/alsa-kernel/synth/emux/Makefile

    r579 r580  
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
    16CINCLUDES = ..\..\..\include;..\..\include;$(%WATCOM)\H
    2 AINCLUDES = $(DDK_BASE)\H
     7AINCLUDES = $(DDK)\base\H
    38
    49CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
    510
    6 32BIT=1
    7 !include ..\..\..\makefile.inc
     11!include $(ROOT)\tools\header.mif
    812
    913
     
    1317#
    1418#===================================================================
    15 FILE1    = emux.obj emux_synth.obj emux_seq.obj emux_nrpn.obj
    16 FILE2    = emux_effect.obj emux_proc.obj soundfont.obj
    17 FILE3    =
    18 FILE4    =
    19 FILE5    =
    20 FILE6    =
    21 FILE7    =
    22 FILE8    =
    23 FILELAST =
    24 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(FILE11) $(FILE12)
     19FILES = emux.obj emux_synth.obj emux_seq.obj emux_nrpn.obj &
     20  emux_effect.obj emux_proc.obj soundfont.obj
    2521
    26 TARGET   = emux
     22TARGET = emux
    2723
    28 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
     24LNKFILE = $(OBJDIR)\$(TARGET).lnk
    2925
    3026
     
    3733
    3834
    39 $(LNKFILE): makefile.os2
     35$(LNKFILE): Makefile
    4036    @%create $(LNKFILE)
    4137    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    4743
    4844clean: .SYMBOLIC
    49      -@rm *.err
    50      @cd $(OBJDIR)
    51      -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    52      @cd ..\..
     45   -@rm *.err
     46    @if exist obj @rm.exe -r obj
     47    @if exist bin @rm.exe -r bin
     48
  • GPL/branches/DAZ/clean.cmd

    r111 r580  
    88wmake -ms -f makefile.os2 DEBUG=1 clean
    99SET KEE=
    10 del drv32\bin\Release.W4\*
    11 del drv32\bin\Release.kee\*
     10del drv32\bin\Release\*
  • GPL/branches/DAZ/drv32/Makefile

    r579 r580  
    1919# USA.
    2020#
     21!ifndef %ROOT
     22!error ROOT is not defined. Please check your SETENV.CMD.
     23!endif
     24ROOT=$(%ROOT)
    2125
    22 .ERASE
     26EVERYTHING_AS_CPP=1
     27#Default packing on byte boundary
     28PACK_1=1
     29!include $(ROOT)\tools\header.mif
     30!include $(ROOT)\include\version.mak
    2331
    24 .SUFFIXES:
    25 .SUFFIXES: .sys .obj .asm .inc .def .lrf .ref .lst .sym .map .c .cpp .h .lib
    26 
    27 !include ..\include\version.mak
     32#.ERASE
     33#
     34#.SUFFIXES:
     35#.SUFFIXES: .sys .obj .asm .inc .def .lrf .ref .lst .sym .map .c .cpp .h .lib
    2836
    2937# note: Watcom headers must be before DDK headers to avoid conflicts
    3038# with C runtime headers
    31 CINCLUDES   = .;..\include;$(%WATCOM)\h;$(DDK_BASE)\h
    32 
    33 AINCLUDES = -I:$(DDK_BASE)\INC
     39CINCLUDES = .;..\include;$(WATCOM)\h;$(DDK)\base\h
     40AINCLUDES = -I:$(DDK)\base\INC
    3441
    3542TARGET   = uniaud32
    3643LNKFILE   = $(OBJDIR)\$(TARGET).lrf
    3744DEFFILE   = $(OBJDIR)\$(TARGET).def
    38 MAKEFILE  = makefile.os2
     45MAKEFILE  = Makefile
    3946
    4047!if "$(IBM_BUILD)" == "1"
    4148CDEFINES = -DIBM_BUILD
    4249!endif
    43 
    44 EVERYTHING_AS_CPP=1
    45 32BIT=1
    46 #Default packing on byte boundary
    47 PACK_1=1
    48 !include ..\makefile.inc
    4950
    5051
     
    5556#===================================================================
    5657
    57 FILEFIRST= begin.obj startup.obj
    58 FILE2    = strategy.obj read.obj
    59 FILE3    = init.obj parse.obj
    60 FILE4    = devhlp.obj
    61 FILE5    = idc.obj dispatch.obj
    62 FILE6    = rmhelp.obj irq.obj util.obj
    63 FILE7    = impdos.lib
     58FILES = begin.obj startup.obj &
     59  strategy.obj read.obj &
     60  init.obj parse.obj &
     61  devhlp.obj &
     62  idc.obj dispatch.obj &
     63  rmhelp.obj irq.obj util.obj &
     64  impdos.lib
    6465!if "$(KEE)" == "1"
    65 FILE8    = impkee.lib
     66FILES += impkee.lib
    6667!endif
    67 FILE10   = end.obj
     68FILES += end.obj
    6869
    69 FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10)
     70LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\cs5535audio.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
     71WMAPNAME = $(OBJDIR)\$(TARGET).wmap
    7072
    71 LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\cs5535audio.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
    72 WMAPNAME = $(OBJDIR)\$(TARGET).wmap
    73 # $(ALSA_LIB)\au88xx.lib
     73# $(ALSA_LIB)\au88xx.lib
    7474#===================================================================
    7575#
     
    8181!ifdef USE_WLINK
    8282$(LNKFILE): $(MAKEFILE)
    83     @%write $^@ option quiet
    84     @%write $^@ option verbose
    85     @%write $^@ option caseexact
    86     @%write $^@ option cache
    87     @%write $^@ option alignment=16
    88     @%write $^@ option map=$(WMAPNAME)
    89 !if "$(ACPI)" == "1"
    90     @%write $^@ option description '$(%BUILDLEVEL) (ACPI)'
    91 !else if "$(KEE)" == "1" !else if "$(KEE)" == "1"
    92     @%write $^@ option description '$(%BUILDLEVEL) (KEE)'
    93 !else
    94     @%write $^@ option description '$(%BUILDLEVEL) (W4)'
    95 !endif
    96     @%write $^@ name $(OBJDIR)\$(TARGET).sys
    97     @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
    98     @for %f in ($(LIBS)) do @%append $^@ library %f
    99 !if "$(ACPI)" == "1"
    100     @%write $^@ $(ACPI_LIB)\acpidrv.lib
    101 !endif
    102     @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib
    103     @%write $^@ library $(%WATCOM)\lib386\os2\os2386.lib
     83  @%write $^@ option quiet
     84  @%write $^@ option verbose
     85  @%write $^@ option caseexact
     86  @%write $^@ option cache
     87  @%write $^@ option alignment=16
     88  @%write $^@ option map=$(WMAPNAME)
     89  @$(ROOT)\tools\AddToFile.cmd $^@,$option description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 and eCS (c) 2014 $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
     90  @%write $^@ name $(OBJDIR)\$(TARGET).sys
     91  @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
     92  @for %f in ($(LIBS)) do @%append $^@ library %f
     93  @%write $^@ library $(WATCOM)\lib386\os2\clib3r.lib
     94  @%write $^@ library $(WATCOM)\lib386\os2\os2386.lib
    10495!else
    10596$(LNKFILE): $(MAKEFILE)
    106     @%write $^@ /OUT:$(OBJDIR)\$(TARGET).sys
    107     @%write $^@ /MAP:$(OBJDIR)\$(TARGET).map
    108     @for %f in ($(FILES)) do @%append $^@ $(OBJDIR)\%f
    109     @for %f in ($(LIBS)) do @%append $^@ %f
    110 !if "$(ACPI)" == "1"
    111     @%write $^@ $(ACPI_LIB)\acpidrv.lib
    112 !endif
    113     @%write $^@ $(%WATCOM)\lib386\os2\clib3r.lib
    114     @%write $^@ $(%WATCOM)\lib386\os2\os2386.lib
    115     @%write $^@ $(DEFFILE)
     97  @%write $^@ /OUT:$(OBJDIR)\$(TARGET).sys
     98  @%write $^@ /MAP:$(OBJDIR)\$(TARGET).map
     99  @for %f in ($(FILES)) do @%append $^@ $(OBJDIR)\%f
     100  @for %f in ($(LIBS)) do @%append $^@ %f
     101  @%write $^@ $(WATCOM)\lib386\os2\clib3r.lib
     102  @%write $^@ $(WATCOM)\lib386\os2\os2386.lib
     103  @%write $^@ $(DEFFILE)
    116104!endif
    117105
    118106$(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
    119 !if "$(ACPI)" == "1"
    120      @%write $(DEFFILE) description '$(%BUILDLEVEL) (ACPI)'
    121 !else if "$(KEE)" == "1"
    122      @%write $(DEFFILE) description '$(%BUILDLEVEL) (KEE)'
    123 !else
    124      @%write $(DEFFILE) description '$(%BUILDLEVEL) (W4)'
    125 !endif
    126 
    127      $(LINK) @$(LNKFILE)
    128 
    129      copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)
    130          
    131 !if "$(ACPI)" == "1"
    132       copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)acpi.sys
    133 !else if "$(KEE)" == "1"
    134       copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)kee.sys
    135 !else
    136      copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)w4.sys
    137 !endif
     107  @%create $(DEFFILE)
     108  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 and eCS (c) 2014 $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
     109  $(LINK) @$(LNKFILE)
     110  copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)
    138111
    139112$(OBJDIR)\$(TARGET).sym: $(LIBS)
    140113!ifdef USE_WLINK
    141      @$(WAT2MAP) $(WMAPNAME) $(OBJDIR)\$(TARGET).map
     114  $(WAT2MAP) $(WMAPNAME) $(OBJDIR)\$(TARGET).map
    142115!endif
    143      cd $(OBJDIR)
    144      mapsym $(TARGET).MAP
    145      cd ..\..
    146      copy $(OBJDIR)\$(TARGET).sym $(ALSA_BIN)
     116  cd $(OBJDIR)
     117  mapsym $(TARGET).MAP
     118  cd ..\..
     119  copy $(OBJDIR)\$(TARGET).sym $(ALSA_BIN)
    147120
    148121clean: .SYMBOLIC
    149      -@rm *.err
    150      @cd $(OBJDIR)
    151      -rm *.obj *.lnk *.lrf *.def *.sys *.sym *.lst *.map *.wmap *.lib
    152      @cd ..\..
    153      -@rm $(ALSA_BIN_)\$(TARGET)*.sys
    154      -@rm $(ALSA_BIN)\$(TARGET).sy*
    155      -@rm $(ALSA_LIB)\*.lib
     122  -@rm *.err
     123  -@rm $(ALSA_BIN)\$(TARGET).sy*
     124  -@rm $(ALSA_LIB)\*.lib
     125  @if exist obj @rm.exe -r obj
     126  @if exist bin @rm.exe -r bin
     127
  • GPL/branches/DAZ/drv32/strategy.c

    r549 r580  
    8383//******************************************************************************
    8484// External initialization complete entry-point
    85 #ifdef ACPI
    86 #include "irqos2.h"
    87 #endif //ACPI
    8885//******************************************************************************
    8986#pragma off (unreferenced)
     
    9289{
    9390        DbgInt.ulState = 2;
    94 #ifdef ACPI
    95         PciAdjustInterrupts();
    96 #endif
    9791        DbgPrintIrq();
    9892        //dprintf(("StratInitComplete"));
  • GPL/branches/DAZ/howtobuild.txt

    r64 r580  
    1 NOTE! Use OpenWatcom 1.4rc1 or later. Also you need IBM's ILINK for driver
     1NOTE! Use OpenWatcom 1.9 or later. Also you need IBM's ILINK for driver
    22      linking. Possible, you can try wlink, but I never did that.
    33
    4 1. Run Configure.cmd
    54
    6 2. Enter path to watcom and ddk base
     51. Setup WATCOM and DDK in your environment.
    76
    8 3. within created makefile.inc check for:
    9    ALSA_SRC
    10    ALSA_LIB_
    11    ALSA_BIN_
    12    define and create corresponding directories
     72. type wmake or wmake -a
    138
    14 4. add following state if not added by configure:
    15    ################################################################################
    16    # Include the right watcom makefile
    17    ################################################################################
    18    !ifdef 32BIT
    19    !include E:\DEV\USS\test\GPL\include\watcom32.mk
    20    !include E:\DEV\USS\test\GPL\include\watcom32.mak
    21    !else
    22    !include E:\DEV\USS\ua2\OCO\include\watcom16.mk
    23    !include E:\DEV\USS\ua2\OCO\include\watcom16.mak
    24    !endif
    25 
    26    DDK_BASE       = e:\ddk\base
    27    WATCOM         = e:\owatcom
    28 
    29 5. run !m_kee.cmd or !m_v4.cmd scrips
    30 
  • GPL/branches/DAZ/lib32/Makefile

    r579 r580  
    1 CINCLUDES = ..\include;..\runtime;..\alsa-kernel\include;$(%WATCOM)\H;$(%WATCOM)\H\OS2;
    2 AINCLUDES = $(DDK_BASE)\H
     1!ifndef %ROOT
     2!error ROOT is not defined. Please check your SETENV.CMD.
     3!endif
     4ROOT=$(%ROOT)
     5
     6!include $(ROOT)\tools\header.mif
     7
     8CINCLUDES = ..\include;..\runtime;..\alsa-kernel\include;$(WATCOM)\H;$(WATCOM)\H\OS2;
     9AINCLUDES = $(DDK)\base\H
    310
    411CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
     
    815!endif
    916
    10 32BIT=1
    11 !include ..\makefile.inc
    12 
    13 
    1417#===================================================================
    1518#
     
    1720#
    1821#===================================================================
    19 FILE1    = spinlock.obj malloc.obj pci.obj irq.obj ioctl.obj
    20 FILE2    = memory.obj debug.obj sound.obj soundmixer.obj soundmidi.obj
    21 #FILE3    = ossidc.obj semaphore.obj waitqueue.obj misc.obj fminstrload.obj
    22 FILE3    = ossidc.obj semaphore.obj waitqueue.obj misc.obj
    23 FILE4    = strncpy.obj task.obj
    24 FILE5    = strncmp.obj timer.obj
    25 FILE6    = instropl2.obj instropl3.obj vsprintf.obj
     22FILES = spinlock.obj malloc.obj pci.obj irq.obj ioctl.obj &
     23  memory.obj debug.obj sound.obj soundmixer.obj soundmidi.obj &
     24  ossidc.obj semaphore.obj waitqueue.obj misc.obj &
     25  strncpy.obj task.obj &
     26  strncmp.obj timer.obj &
     27  instropl2.obj instropl3.obj vsprintf.obj
     28# ossidc.obj semaphore.obj waitqueue.obj misc.obj fminstrload.obj
    2629!if $(KEE) == 0
    27 FILE7    = stack.obj
    28 !else
    29 FILE7    =
     30FILES += stack.obj
    3031!endif
    31 FILE8    =
    32 FILELAST =
    33 FILES    = $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9)
    3432
    35 TARGET   = linuxlib
     33TARGET = linuxlib
    3634
    37 LNKFILE  = $(OBJDIR)\$(TARGET).lnk
    38 
     35LNKFILE = $(OBJDIR)\$(TARGET).lnk
    3936
    4037#===================================================================
     
    4643
    4744
    48 $(LNKFILE): makefile.os2
     45$(LNKFILE): Makefile
    4946    @%create $(LNKFILE)
    5047    @for %f in ($(FILES)) do @%append $(LNKFILE) -+$(OBJDIR)\%f
     
    5754clean: .SYMBOLIC
    5855    -@rm *.err
    59     @cd $(OBJDIR)
    60     -rm *.obj *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    61     @cd ../..
     56    @if exist obj @rm.exe -r obj
     57    @if exist bin @rm.exe -r bin
     58
  • GPL/branches/DAZ/lib32/pci.c

    r577 r580  
    5555#define PCI_CONFIG_DATA                 0xCFC
    5656
    57 #ifdef ACPI
    58 APIRET APIENTRY ACPIFindPCIDevice(ULONG Bus, ULONG Dev, ULONG Fun, ULONG *PicIRQ, ULONG *ApicIRQ, ULONG *Hdl, char *Component);
    59 #endif
    60 
    6157//******************************************************************************
    6258#define CONFIG_CMD(dev, where)  \
     
    140136        int             resNo, addr;
    141137        u32 devNr, busNr, funcNr, detectedId, cfgaddrreg, ulPciAdr, ulTmp1, ulTmp2;
    142 #ifdef ACPI
    143         APIRET                   rc;
    144         ULONG                    PicIRQ, ApicIRQ;
    145 #endif
    146138        u8              headerType;
    147139
     
    239231                                pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &ulTmp1);
    240232                                rprintf(("pci_query_device: PCI config IRQ=%d", ulTmp1&0xff));
    241 #ifdef ACPI
    242                                 rc = ACPIFindPCIDevice( (ULONG)busNr,                                            // Bus
    243                                                                                 (ULONG)devNr,                                            // Dev
    244                                                                                 (ULONG)(pcidev->devfn >> 8) & 7,         // Function
    245                                                                                 &PicIRQ,                                                         // PIC IRQ
    246                                                                                 &ApicIRQ,                                                        // APIC IRQ
    247                                                                                 NULL,                                                            // ACPI handle to finding device
    248                                                                                 "Uniaud32");                                             // Name for acpi log
    249                                 if (!rc) {
    250                                         if (PicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (PicIRQ & 0xff); // Choose Pic interrupt for init time processing
    251                                         else if (ApicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (ApicIRQ & 0xff);
    252                                         rprintf(("pci_query_device: IRQs ACPI PIC=%ld APIC=%ld chosen=%d", PicIRQ, ApicIRQ, ulTmp1&0xff));
    253                                         pcidev->picirq = PicIRQ;   // Save the Pic and
    254                                         pcidev->apicirq = ApicIRQ; // Save the Apic interrupt for switching later
    255                                 }
    256 #endif /* ACPI */
    257233                                if( (u8)ulTmp1 && (u8)ulTmp1 != 0xff ) {
    258234                                        pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
     
    972948}
    973949
    974 #ifdef ACPI
    975 void PciAdjustInterrupts() {
    976         int i;
    977         struct pci_dev *pcidev;
    978         struct pci_driver *driver;
    979         ULONG ulTmp1, rc;
    980 
    981         for (i=0; i<MAX_PCI_DEVICES; i++) {
    982                 if (!pci_devices[i].devfn) continue;
    983                 pcidev = &pci_devices[i];
    984                 ulTmp1 = pcidev->irq;
    985                 if (pcidev->apicirq) ulTmp1 = pcidev->apicirq;
    986                 else if (pcidev->picirq) ulTmp1 = pcidev->picirq;
    987                 rprintf(("PciAdjustInterrupts: IRQs ACPI PIC=%ld APIC=%ld was=%d chosen=%ld", pcidev->picirq, pcidev->apicirq, pcidev->irq, ulTmp1));
    988                 if( (u8)ulTmp1 && ((u8)ulTmp1 != 0xff) && ((u8)ulTmp1 != pcidev->irq) ) {
    989                         RMSetHandles(pcidev->hAdapter, pcidev->hDevice); /* DAZ - dirty hack */
    990                         driver = pcidev->pcidriver;
    991                         if(driver && driver->suspend) driver->suspend(pcidev, SNDRV_CTL_POWER_D0);
    992 
    993                         pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
    994                         pcidev->irq_resource[0].start = pcidev->irq_resource[0].end   = ulTmp1 & 0xffff;
    995                         pcidev->irq = (u8)ulTmp1;
    996 
    997                         fRewired = TRUE;
    998                         // if(driver && driver->resume) driver->resume(pcidev);
    999                 }
    1000         } /* for loop */
    1001 }
    1002 #endif
  • GPL/branches/DAZ/tools/mkversion.cmd

    r577 r580  
    22 * Set time/date/hostname for uniaud build environment
    33 */
     4call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs';
     5call SysLoadFuncs;
    46
    5 parse arg sAlsaBase
     7parse arg sDebugMode;
    68
    79/* I don't this will ever change from Netlabs */
    8 projVendor    = "Netlabs"
    9 projProduct   = "OS/2 Universal Audio 32 Driver"
    10 projVendorNam = "Netlabs <www.netlabs.org>"
    11 projAdapter   = "OS/2 Universal Audio"
    12 
     10projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs');
     11projProduct   = "OS/2 Universal Audio 32 Driver";
     12projVendorNam = "Netlabs <www.netlabs.org>";
     13projAdapter   = "OS/2 Universal Audio";
    1314
    1415/* uniaud.inc is located in the base gpl directory and
     
    1617 * written to include\version.h.
    1718 */
    18 if sAlsaBase = "" then sAlsaBase = "."
    19 versConst = sAlsaBase"\uniaud.inc"
     19sAlsaBase = Directory();
     20versConst = sAlsaBase||"\uniaud.inc";
    2021
    21 versMak   = sAlsaBase"\include\version.mak"
    22 versHdr   = sAlsaBase"\include\version.h"
    23 AlsaVersHdr = sAlsaBase'\alsa-kernel\include\sound\version.h'
     22versMak   = sAlsaBase||"\include\version.mak";
     23versHdr   = sAlsaBase||"\include\version.h";
     24AlsaVersHdr = sAlsaBase||'\alsa-kernel\include\sound\version.h';
    2425
    2526/* get and format date and time */
    26 curDate    = DATE('S')
    27 projDate   = RIGHT(curDate, 2)"."SUBSTR(curDate, 5, 2)"."LEFT(curDate, 4)
    28 projDate2  = LEFT(curDate, 4)SUBSTR(curDate, 5, 2)RIGHT(curDate, 2)L
    29 projTime   = TIME( )
     27curDate    = DATE('S');
     28projDate   = RIGHT(curDate, 2)||"."||SUBSTR(curDate, 5, 2)||"."||LEFT(curDate, 4);
     29projDate2  = LEFT(curDate, 4)||SUBSTR(curDate, 5, 2)||RIGHT(curDate, 2)L
     30projTime   = TIME( );
    3031
    31 /* get hostname for build system */
    32 projHost = VALUE('HOSTNAME',,'OS2ENVIRONMENT')
     32if (sDebugMode<>'') then do
     33  say "Project date: "projDate
     34  say "Project time: "projTime
     35  say "Inc File:     "versConst
     36  say "Version Mak:   "versMak
     37  say "Version Hdr:   "versHdr
     38end
    3339
    34 projString = left(Date() TIME(),25)left(projHost,10)
     40LINEIN(versConst,,0);
    3541
    36 say "Project date: "projDate
    37 say "Project time: "projTime
    38 say "hostname:     "projHost
    39 say "Version In:    "versConst
    40 say "Version Mak:   "versMak
    41 say "Version Hdr:   "versHdr
    42 
    43 LINEIN(versConst,,0)
    44 
    45 fixpack = ''
     42fixpack = '';
    4643
    4744do while(LINES(versConst))
    48     tmpLine = LINEIN(versConst)
     45  tmpLine = LINEIN(versConst);
    4946
    50     IF POS('#', tmpline) = 1 Then iterate
     47  IF POS('#', tmpline) = 1 Then iterate;
    5148
    52     opLoc = POS('BUILDVERSION', tmpLine)
    53     if opLoc > 0 then
    54       versionIn = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
     49  opLoc = POS('BUILDVERSION', tmpLine);
     50  if opLoc > 0 then
     51    versionIn = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    5552
    56     opLoc = POS('PRODUCTNAME', tmpLine)
    57     if opLoc > 0 then
    58       productName = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
     53  opLoc = POS('PRODUCTNAME', tmpLine)
     54  if opLoc > 0 then
     55    productName = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    5956
    60     opLoc = POS('FIXPACK', tmpLine)
    61     if opLoc > 0 then
    62       fixpack = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    63 
     57  opLoc = POS('FIXPACK', tmpLine)
     58  if opLoc > 0 then
     59    fixpack = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    6460end
    6561
    66 if versionIn = "" then do
    67     say "Could not find Version in "versConst
    68     exit
     62if (sDebugMode<>'') then say 'versionIn='||versionIn;
     63
     64if (versionIn = "") then do
     65  say "Could not find Version in "||versConst;
     66  exit;
    6967end
    7068
     
    7270
    7371if fixpack="" then
    74         projVers  = versionIn
     72  projVers = versionIn;
    7573else
    76         projVers  = versionIn'-'fixpack
     74  projVers = versionIn||'-'||fixpack;
    7775
    78 projVers2 = major||minor||projVersion
     76projVers2 = major||minor||projVersion;
    7977
    8078LINEIN(AlsaVersHdr,,0)
     
    8381
    8482do while(LINES(AlsaVersHdr))
    85     tmpLine = LINEIN(AlsaVersHdr)
    86     opLoc = POS('#define CONFIG_SND_VERSION', tmpLine)
    87     if opLoc > 0 then
    88       AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"')
     83  tmpLine = LINEIN(AlsaVersHdr)
     84  opLoc = POS('#define CONFIG_SND_VERSION', tmpLine)
     85  if opLoc > 0 then AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"')
    8986end
    9087
    91 SAY 'Alsalevel = ' AlsaLevel
     88if (sDebugMode<>'') then do
     89  SAY 'Alsalevel='||AlsaLevel;
     90  say 'ProjVendor='||ProjVendor;
     91  say 'versionIn='||versionIn;
     92  say 'ProjString='||ProjString;
     93  say 'alsalevel='||alsalevel;
     94  say 'ProjVersion='||ProjVersion;
     95  say 'projVers='||projVers;
     96  say 'projVers2='||projVers2;
     97  say 'Fixpack='||Fixpack;
     98end
    9299
    93 SET "BUILDLEVEL=@#"ProjVendor":"versionIn"#@##1## "ProjString":"alsalevel":::"ProjVersion"::"Fixpack"@@"productname
    94 
    95 call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
    96 call SysLoadFuncs
    97 dummy = SysFileDelete(versMak)
     100dummy = SysFileDelete(versMak);
    98101
    99102if (stream(versMak, 'c', 'open write' ) = 'READY:') then
    100103do
    101104    call lineout versMak, '#'
    102 /*    call lineout versMak, '#       VERSION.MAK'
     105    call lineout versMak, '#       VERSION.MAK'
    103106    call lineout versMak, '#'
    104107    call lineout versMak, '#       Current build level for File Versioning'
     
    106109    call lineout versMak, '#       Generated by mkversion.cmd, do NOT edit !'
    107110    call lineout versMak, '#'
    108     call lineout versMak, 'BLDLVL_VENDOR = 'projVendor
    109     call lineout versMak, 'BLDLVL_PRODUCT = 'projProduct
    110     call lineout versMak, 'BLDLVL_REVISION = 'major'.'minor
    111     call lineout versMak, 'BLDLVL_FILEVER = 'projVersion
    112     call lineout versMak, 'BLDLVL_DATETIME = 'projDate' 'projTime
    113     call lineout versMak, 'BLDLVL_MACHINE = 'projHost
     111    call lineout versMak, 'BLDLVL_VENDOR = '||projVendor;
     112    call lineout versMak, 'BLDLVL_VERSION = '||versionIn;
     113    call lineout versMak, 'BLDLVL_FIXPACK = '||Fixpack;
     114    call lineout versMak, 'BLDLVL_ALSA = '||alsalevel;
    114115    call stream versMak, 'c', 'close';
    115 */
    116116end
    117117else
     
    121121end
    122122
    123 
    124123dummy = SysFileDelete(versHdr)
    125124
    126125if (stream(versHdr, 'c', 'open write' ) = 'READY:') then
    127126do
    128     call lineout versHdr, '/*'
    129     call lineout versHdr, ' * version.h   Header for version string'
    130     call lineout versHdr, ' *'
    131     call lineout versHdr, ' *    Generated by mkversion.cmd, do NOT edit !'
    132     call lineout versHdr, ' *'
    133     call lineout versHdr, ' */'
     127    call lineout versHdr, '/*';
     128    call lineout versHdr, ' * version.h   Header for version string';
     129    call lineout versHdr, ' *';
     130    call lineout versHdr, ' *    Generated by mkversion.cmd, do NOT edit !';
     131    call lineout versHdr, ' *';
     132    call lineout versHdr, ' */';
     133    call lineout versHdr, ' ';
     134    call lineout versHdr, ' ';
     135    call lineout versHdr, '#ifndef __UNIAUDVERSION_H__';
     136    call lineout versHdr, '#define __UNIAUDVERSION_H__';
     137    call lineout versHdr, ' ';
     138    call lineout versHdr, ' ';
     139    call lineout versHdr, '#define PRODUCT_NAME            "'||ProductName||'"';
     140    call lineout versHdr, '#define VENDOR_NAME             "'||projVendor||'"';
     141    call lineout versHdr, '#define PRODUCT_TIMESTAMP       '||projDate2||'       // YYYYMMDD';
     142    call lineout versHdr, '#define UNIAUD_VERSION          "'||projVers||'"';
     143    call lineout versHdr, '#define ALSA_VERSION            "'||alsalevel||'"';
    134144    call lineout versHdr, ' '
    135145    call lineout versHdr, ' '
    136     call lineout versHdr, '#ifndef __UNIAUDVERSION_H__'
    137     call lineout versHdr, '#define __UNIAUDVERSION_H__'
    138     call lineout versHdr, ' '
    139     call lineout versHdr, ' '
    140     call lineout versHdr, '#define PRODUCT_NAME            "'ProductName'"'
    141     call lineout versHdr, '#define VENDOR_NAME             "'projVendor'"'
    142     call lineout versHdr, '#define PRODUCT_TIMESTAMP       'projDate2'       // YYYYMMDD'
    143     call lineout versHdr, '#define UNIAUD_VERSION          "'projVers'"'
    144     call lineout versHdr, '#define ALSA_VERSION            "'alsalevel'"'
    145     call lineout versHdr, ' '
    146     call lineout versHdr, ' '
    147     call lineout versHdr, '#define RM_VERSION              'projVers2
    148     call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"'
    149     call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'projProduct'"'
    150     call lineout versHdr, '#define RM_ADAPTER_NAME         "'projAdapter'"'
    151     call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'projVendorNam'"'
    152     call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)'
    153     call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)'
    154     call lineout versHdr, '#define RM_DRIVER_BUILDDAY      (PRODUCT_TIMESTAMP % 100)'
    155     call lineout versHdr, ' '
    156     call lineout versHdr, ' '
    157     call lineout versHdr, "#endif //__UNIAUDVERSION_H__"
    158     call lineout versHdr, ' '
     146    call lineout versHdr, '#define RM_VERSION              '||projVers2;
     147    call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"';
     148    call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'||projProduct||'"';
     149    call lineout versHdr, '#define RM_ADAPTER_NAME         "'||projAdapter||'"';
     150    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendorNam||'"';
     151    call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)';
     152    call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)';
     153    call lineout versHdr, '#define RM_DRIVER_BUILDDAY      (PRODUCT_TIMESTAMP % 100)';
     154    call lineout versHdr, ' ';
     155    call lineout versHdr, ' ';
     156    call lineout versHdr, "#endif //__UNIAUDVERSION_H__";
     157    call lineout versHdr, ' ';
    159158    call stream versHdr, 'c', 'close';
    160159end
     
    167166exit 0;
    168167
     168/**
     169 * Procedure section
     170 **/
    169171
     172EnvVar_Get: procedure
     173    parse arg sEnvVar
     174    if translate(sEnvVar) == 'BEGINLIBPATH' then
     175      s = SysQueryExtLibpath('B')
     176    else if translate(sEnvVar) == 'ENDLIBPATH' then
     177      s = SysQueryExtLibpath('E')
     178    else
     179      s = value(sEnvVar,, 'OS2ENVIRONMENT')
     180    return s;
    170181
     182/*
     183 * Returns value of sEnvVar from environment if set or returns default value.
     184 */
     185EnvVar_Get_If: procedure
     186  parse arg sEnvVar, sDefault;
     187  s = EnvVar_Get(sEnvVar);
     188  if s == '' then
     189    s = sDefault;
     190  return s;
     191
  • GPL/branches/DAZ/uniaud.inc

    r577 r580  
    1313# ex RC3  GA  FIXPACK2 beta_47
    1414# Comment out to avoid a fixpack line in bldlevel
    15 FIXPACK = SVN551
     15FIXPACK = SVN
    1616
    1717# ALSA BUILD VERSION
Note: See TracChangeset for help on using the changeset viewer.