Changeset 577


Ignore:
Timestamp:
Sep 18, 2013, 8:42:17 PM (12 years ago)
Author:
David Azarewicz
Message:

fix build scripts

Location:
GPL/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/drv32/startup.asm

    r547 r577  
    3232        include os2.inc
    3333
    34         include segments.inc
     34        include segments.inc
    3535        include startup.inc
    3636

  • GPL/trunk/include/watcom32.mak

    r493 r577  
    1313
    1414!if "$(DEBUG)" == "1"
    15 CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
     15CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
    1616CPPFLAGS= -xd
    1717ASFLAGS = -D:DEBUG -Mb -Li -Sv:M510

  • GPL/trunk/lib32/irq.c

    r551 r577  
    8383
    8484        if ( pSlot ) {
    85                 hRes = NULL;
     85                hRes = 0;
    8686                if (RMRequestIRQ(irq, (ulSharedFlag & SA_SHIRQ) != 0, &hRes) == FALSE) {
    8787                        rprintf(("RMRequestIRQ failed for irq %d", irq));
    … …  
    129129                                        pSlot->irqNo = 0;
    130130                                        RMDeallocateIRQ(pSlot->hRes);
    131                                         pSlot->hRes = NULL;
     131                                        pSlot->hRes = 0;
    132132                                        // pSlot->fEOI = 0;
    133133                                }

  • GPL/trunk/lib32/pci.c

    r549 r577  
    972972}
    973973
     974#ifdef ACPI
    974975void PciAdjustInterrupts() {
    975976        int i;
    … …  
    9991000        } /* for loop */
    10001001}
     1002#endif

  • GPL/trunk/tools/mkversion.cmd

    r322 r577  
    7676        projVers  = versionIn'-'fixpack
    7777
    78 projVers2 = major||minor||LEFT(projVersion, 1)
     78projVers2 = major||minor||projVersion
    7979
    8080LINEIN(AlsaVersHdr,,0)
    … …  
    8686    opLoc = POS('#define CONFIG_SND_VERSION', tmpLine)
    8787    if opLoc > 0 then
    88       AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"') 
     88      AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"')
    8989end
    9090
    9191SAY 'Alsalevel = ' AlsaLevel
    9292
    93 SET "BUILDLEVEL=@#"ProjVendor":"major"."minor"#@##1## "ProjString":"alsalevel":::"ProjVersion"::"Fixpack"@@"productname
     93SET "BUILDLEVEL=@#"ProjVendor":"versionIn"#@##1## "ProjString":"alsalevel":::"ProjVersion"::"Fixpack"@@"productname
    9494
    9595call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
    … …  
    103103    call lineout versMak, '#'
    104104    call lineout versMak, '#       Current build level for File Versioning'
    105     call lineout versMak, '#'   
     105    call lineout versMak, '#'
    106106    call lineout versMak, '#       Generated by mkversion.cmd, do NOT edit !'
    107107    call lineout versMak, '#'

  • GPL/trunk/uniaud.inc

    r551 r577  
    77# BUILDVERSION must be 3 parts, and only numbers like 5.44.108
    88# It is best that 2'nd number is always 2 digits, eg at least 10
    9 BUILDVERSION = 1.9.26
     9BUILDVERSION = 1.09.26
    1010
    1111# Fixpack version
Note: See TracChangeset for help on using the changeset viewer.