Changeset 696


Ignore:
Timestamp:
Jun 17, 2007, 3:21:18 AM (13 years ago)
Author:
Steven Levine
Message:

More OpenWatcom? compatibility updates

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/arccnrs.c

    r690 r696  
    3939  12 May 07 SHL Use dcd->ulItemsToUnHilite; sync with UnHilite arg mods
    4040  10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
     41  16 Jun 07 SHL Use DosQueryAppType not DosQAppType
    4142
    4243***********************************************************************/
     
    386387      *p = 0;
    387388    DosError(FERR_DISABLEHARDERR);
    388     if (!DosQAppType(s, &apptype) &&
     389    if (!DosQueryAppType(s, &apptype) &&
    389390        (apptype & FAPPTYP_DOS ||
    390391         apptype & FAPPTYP_WINDOWSREAL ||
  • trunk/dll/fm3dll.h

    r689 r696  
    4949  05 Jun 07 SHL Update for OpenWatcom
    5050  10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
     51  16 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
     52  16 Jun 07 SHL Update more for OpenWatcom
    5153
    5254***********************************************************************/
     
    104106#define BKS_MERLINSTYLE   0x0800
    105107#endif
    106 #ifndef PMBITMAP_INCLUDED
     108#if !defined(PMBITMAP_INCLUDED) && !defined(INCL_GPIINCLUDED)
    107109typedef struct _RGB2            /* rgb2 */
    108110{
  • trunk/dll/internal/makefile

    r691 r696  
    1010!include ..\..\makefile_pre.mk
    1111
    12 # CFLAGS = /G5 /Gm+ /Gs- /Gt- /IDLL /Mp /O- /Q+     /Sp4 /Ss /Ti+ /W3
    13 # CFLAGS = /G5 /Gm+ /Gs- /Gt-       /Mp /O+ /Q+ /Sm      /Ss /W3
    1412# -bc           console app
    1513# -bm           multithread libs
     
    5351   @%write $^@ option map
    5452   @%write $^@ name $(BASE)
    55    @%write $^@ op desc '@$#$(%VENDOR):$(%BUILDVER)$#@$#$#1$#$# $(%BUILDTIME)      slamain::EN:US:0:U:@@Fm/2 Strings Compiler'
     53   @%write $^@ op desc '@$#SLAInc:3.05.09$#@$#$#1$#$# 06/15/2007 03:05:09      slamain::EN:US:0:U:@@Fm/2 Strings Compiler'
    5654   @%write $^@ file $(BASE).obj
    5755   @%write $^@ library os2386.lib
  • trunk/dll/makefile

    r691 r696  
    7676
    7777!ifdef %DEBUG
    78 CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -j -wx -zfp -zgp -zq -hd
    79 !else
    80 CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -j -wx -zfp -zgp -zq -hd
     78CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
     79!else
     80CFLAGS =   -bt=os2 -mf -bd -bm -d1 -olirs   -s -sg -j -wx -zfp -zgp -zq -hd
    8181!endif
    8282
  • trunk/makefile

    r691 r696  
    4747
    4848allexe: *.mak .symbolic
    49   !$(MAKE) -f $? $(__MAKEOPTS__)
     49   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__)
    5050
    5151wpi: .symbolic
Note: See TracChangeset for help on using the changeset viewer.