Changeset 3864 for trunk/src


Ignore:
Timestamp:
Jul 19, 2000, 9:05:27 PM (25 years ago)
Author:
sandervl
Message:

Changed makefiles for debug & retail odincrt, gdi32-region api wrapper change

Location:
trunk/src
Files:
2 added
57 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/DPlayX/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.8 2000-03-06 23:38:14 bird Exp $
     1# $Id: makefile,v 1.9 2000-07-19 19:05:04 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959$(PDWIN32_LIB)/advapi32.lib
    6060OS2386.LIB
  • trunk/src/NTDLL/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.21 2000-03-06 23:38:14 bird Exp $
     1# $Id: makefile,v 1.22 2000-07-19 19:05:04 sandervl Exp $
    22
    33#
     
    7373$(PDWIN32_LIB)/kernel32.lib
    7474$(PDWIN32_LIB)/crtdll.lib
    75 $(PDWIN32_LIB)/odincrt.lib
     75$(PDWIN32_LIB)/$(ODINCRT).lib
    7676OS2386.LIB
    7777$(RTLLIB_O)
  • trunk/src/advapi32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.23 2000-03-06 23:38:15 bird Exp $
     1# $Id: makefile,v 1.24 2000-07-19 19:05:04 sandervl Exp $
    22
    33#
     
    6262$(PDWIN32_LIB)/kernel32.lib
    6363$(PDWIN32_LIB)/ntdll.lib
    64 $(PDWIN32_LIB)/odincrt.lib
     64$(PDWIN32_LIB)/$(ODINCRT).lib
    6565$(PDWIN32_LIB)/pmwinx.lib
    6666OS2386.LIB
  • trunk/src/avifil32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.8 2000-03-06 23:38:16 bird Exp $
     1# $Id: makefile,v 1.9 2000-07-19 19:05:05 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/capi2032/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.12 2000-03-06 23:38:17 bird Exp $
     1# $Id: makefile,v 1.13 2000-07-19 19:05:05 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/comctl32/makefile

    r3203 r3864  
    1 # $Id: makefile,v 1.25 2000-03-23 17:14:45 cbratschi Exp $
     1# $Id: makefile,v 1.26 2000-07-19 19:05:05 sandervl Exp $
    22
    33#
     
    8383$(PDWIN32_LIB)/gdi32.lib
    8484$(PDWIN32_LIB)/user32.lib
    85 $(PDWIN32_LIB)/odincrt.lib
     85$(PDWIN32_LIB)/$(ODINCRT).lib
    8686OS2386.LIB
    8787$(RTLLIB_O)
  • trunk/src/comdlg32/makefile

    r3544 r3864  
    1 # $Id: makefile,v 1.17 2000-05-16 20:00:13 sandervl Exp $
     1# $Id: makefile,v 1.18 2000-07-19 19:05:05 sandervl Exp $
    22
    33#
     
    6464$(PDWIN32_LIB)/kernel32.lib
    6565$(PDWIN32_LIB)/user32.lib
    66 $(PDWIN32_LIB)/odincrt.lib
     66$(PDWIN32_LIB)/$(ODINCRT).lib
    6767$(PDWIN32_LIB)/shlwapi.lib
    6868$(PDWIN32_LIB)/shell32.lib
  • trunk/src/crtdll/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.10 2000-03-06 23:38:33 bird Exp $
     1# $Id: makefile,v 1.11 2000-07-19 19:05:05 sandervl Exp $
    22
    33#
     
    6464$(PDWIN32_LIB)/pmwinx.lib
    6565$(PDWIN32_LIB)/kernel32.lib
    66 $(PDWIN32_LIB)/odincrt.lib
     66$(PDWIN32_LIB)/$(ODINCRT).lib
    6767$(PDWIN32_LIB)/user32.lib
    6868OS2386.LIB
  • trunk/src/ddraw/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.23 2000-03-06 23:38:34 bird Exp $
     1# $Id: makefile,v 1.24 2000-07-19 19:05:05 sandervl Exp $
    22#
    33# ddraw.dll makefile
     
    7777$(PDWIN32_LIB)/comctl32.lib
    7878$(PDWIN32_LIB)/kernel32.lib
    79 $(PDWIN32_LIB)/odincrt.lib
     79$(PDWIN32_LIB)/$(ODINCRT).lib
    8080$(PDWIN32_LIB)/user32.lib
    8181mmpm2.lib
  • trunk/src/dinput/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.6 2000-03-06 23:38:35 bird Exp $
     1# $Id: makefile,v 1.7 2000-07-19 19:05:06 sandervl Exp $
    22
    33#
     
    5858$(OBJS)
    5959$(PDWIN32_LIB)/kernel32.lib
    60 $(PDWIN32_LIB)/odincrt.lib
     60$(PDWIN32_LIB)/$(ODINCRT).lib
    6161OS2386.LIB
    6262$(RTLLIB_O)
  • trunk/src/dplay/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.7 2000-03-06 23:38:36 bird Exp $
     1# $Id: makefile,v 1.8 2000-07-19 19:05:06 sandervl Exp $
    22
    33#
     
    5555$(OBJS)
    5656$(PDWIN32_LIB)/kernel32.lib
    57 $(PDWIN32_LIB)/odincrt.lib
     57$(PDWIN32_LIB)/$(ODINCRT).lib
    5858OS2386.LIB $(RTLLIB_O)
    5959$(PDWIN32_LIB)/ole32.lib
  • trunk/src/dsound/makefile

    r3099 r3864  
    1 # $Id: makefile,v 1.18 2000-03-13 12:47:53 sandervl Exp $
     1# $Id: makefile,v 1.19 2000-07-19 19:05:06 sandervl Exp $
    22
    33#
     
    6565pmwinx.lib
    6666$(PDWIN32_LIB)/kernel32.lib
    67 $(PDWIN32_LIB)/odincrt.lib
     67$(PDWIN32_LIB)/$(ODINCRT).lib
    6868$(PDWIN32_LIB)/ole32.lib
    6969mmpm2.lib
  • trunk/src/gdi32/gdi32.DEF

    r3705 r3864  
    1 ; $Id: gdi32.DEF,v 1.8 2000-06-14 13:17:49 sandervl Exp $
     1; $Id: gdi32.DEF,v 1.9 2000-07-19 19:05:06 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
     
    359359    InternalGetTabbedTextExtentW @1005
    360360
    361     setWinDeviceRegionFromPMDeviceRegion__FUlT1P7_DCDataT1     @1006
     361    _setWinDeviceRegionFromPMDeviceRegion@16                   @1006
    362362
    363363    ObjAllocateHandle__FPUlUl10ObjectType                      @1007
  • trunk/src/gdi32/makefile

    r3705 r3864  
    1 # $Id: makefile,v 1.26 2000-06-14 13:17:50 sandervl Exp $
     1# $Id: makefile,v 1.27 2000-07-19 19:05:06 sandervl Exp $
    22
    33#
     
    2020# Flag overloads and local macros.
    2121CLEANEXTRAS = gdi32rsrc.asm
    22 
    2322
    2423# Object files. All objects should be prefixed with $(OBJDIR)!
     
    7574$(PDWIN32_LIB)/kernel32.lib
    7675$(PDWIN32_LIB)/user32.lib
    77 $(PDWIN32_LIB)/odincrt.lib
     76$(PDWIN32_LIB)/$(ODINCRT).lib
    7877OS2386.LIB
    7978$(RTLLIB_O)
  • trunk/src/gdi32/region.cpp

    r3715 r3864  
    1 /* $Id: region.cpp,v 1.9 2000-06-16 11:05:22 sandervl Exp $ */
     1/* $Id: region.cpp,v 1.10 2000-07-19 19:05:06 sandervl Exp $ */
    22
    33/*
     
    1515#define  INCL_GPI
    1616#define  INCL_WIN
    17 #include <os2wrap.h>
     17#include <os2.h> //no wrappers required here!
    1818
    1919#include <win32type.h>
     
    2424#include <string.h>
    2525#include <misc.h>
     26#include <odinwrap.h>
    2627#include <objhandle.h>
    2728#include <dcdata.h>
     
    294295}
    295296//******************************************************************************
    296 //******************************************************************************
    297 BOOL setWinDeviceRegionFromPMDeviceRegion(HRGN winHrgn, HRGN pmHrgn, pDCData pHpsPmHrgn, HWND hwndPmHrgn)
     297//exported (used by user32)
     298//******************************************************************************
     299BOOL WIN32API setWinDeviceRegionFromPMDeviceRegion(HRGN winHrgn, HRGN pmHrgn, pDCData pHpsPmHrgn, HWND hwndPmHrgn)
    298300{
    299301    BOOL    success;
     
    358360//******************************************************************************
    359361//******************************************************************************
    360 int WIN32API SelectClipRgn(HDC hdc, HRGN hrgn)
     362ODINFUNCTIONNODBG2(int, SelectClipRgn, HDC, hdc, HRGN, hrgn)
    361363{
    362364 LONG lComplexity = RGN_NULL;
     
    421423//******************************************************************************
    422424//******************************************************************************
    423 int WIN32API ExtSelectClipRgn(HDC hdc, HRGN hrgn, int mode)
     425ODINFUNCTIONNODBG3(int, ExtSelectClipRgn, HDC, hdc, HRGN, hrgn, int, mode)
    424426{
    425427   pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    524526//******************************************************************************
    525527//******************************************************************************
    526 int WIN32API GetClipBox(HDC hdc, PRECT lpRect)
     528ODINFUNCTIONNODBG2(int, GetClipBox, HDC, hdc, PRECT, lpRect)
    527529{
    528530 pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    585587//******************************************************************************
    586588//******************************************************************************
    587 int WIN32API GetClipRgn(HDC hdc, HRGN hrgn)
     589ODINFUNCTIONNODBG2(int, GetClipRgn, HDC, hdc, HRGN, hrgn)
    588590{
    589591   pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    628630//******************************************************************************
    629631//******************************************************************************
    630 int WIN32API ExcludeClipRect(HDC hdc, int left, int top, int right, int bottom)
     632ODINFUNCTIONNODBG5(int, ExcludeClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
    631633{
    632634    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    662664//******************************************************************************
    663665//******************************************************************************
    664 int WIN32API IntersectClipRect(HDC hdc, int left, int top, int right, int bottom)
     666ODINFUNCTIONNODBG5(int, IntersectClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
    665667{
    666668    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    692694//******************************************************************************
    693695//******************************************************************************
    694 int WIN32API OffsetClipRgn(HDC hdc, int nXOffset, int nYOffset )
     696ODINFUNCTIONNODBG3(int, OffsetClipRgn, HDC, hdc, int, nXOffset, int, nYOffset )
    695697{
    696698   BOOL      success;
     
    715717//******************************************************************************
    716718//******************************************************************************
    717 HRGN WIN32API CreatePolyPolygonRgn(const POINT * lppt, const int *pPolyCount, int nCount, int fnPolyFillMode)
     719ODINFUNCTIONNODBG4(HRGN, CreatePolyPolygonRgn, const POINT * , lppt, const int *, pPolyCount, int,  nCount, int, fnPolyFillMode)
    718720{
    719721 LONG  flMode;
     
    773775//******************************************************************************
    774776//******************************************************************************
    775 HRGN WIN32API CreateRectRgn( int left, int top, int right, int bottom)
     777ODINFUNCTIONNODBG4(HRGN, CreateRectRgn, int, left, int, top, int, right, int, bottom)
    776778{
    777779 HRGN   hrgn;
     
    795797//******************************************************************************
    796798//******************************************************************************
    797 HRGN WIN32API CreateRectRgnIndirect(const RECT *lprc)
     799ODINFUNCTIONNODBG1(HRGN, CreateRectRgnIndirect, const RECT *, lprc)
    798800{
    799801   return CreateRectRgn(lprc->left, lprc->top, lprc->right, lprc->bottom);
     
    801803//******************************************************************************
    802804//******************************************************************************
    803 HRGN WIN32API CreateRoundRectRgn(int left, int top, int right, int bottom, int nWidthEllipse, int nHeightEllipse)
     805ODINFUNCTIONNODBG6(HRGN, CreateRoundRectRgn, int, left, int, top, int, right, int, bottom, int, nWidthEllipse, int, nHeightEllipse)
    804806{
    805807 HRGN   hrgn;
     
    827829//******************************************************************************
    828830//******************************************************************************
    829 HRGN WIN32API ExtCreateRegion(const XFORM_W *pXform, DWORD count, const RGNDATA *pData)
     831ODINFUNCTIONNODBG3(HRGN, ExtCreateRegion, const XFORM_W *, pXform, DWORD, count, const RGNDATA *, pData)
    830832{
    831833   HRGN hrgn;
     
    936938//******************************************************************************
    937939//******************************************************************************
    938 HRGN WIN32API CreateEllipticRgn(int left, int top, int right, int bottom)
     940ODINFUNCTIONNODBG4(HRGN, CreateEllipticRgn, int, left, int, top, int, right, int, bottom)
    939941{
    940942 HRGN hrgn;
     
    957959//******************************************************************************
    958960//******************************************************************************
    959 HRGN WIN32API CreateEllipticRgnIndirect(const RECT *pRect)
    960 {
    961    return CreateEllipticRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);
    962 }
    963 //******************************************************************************
    964 //******************************************************************************
    965 HRGN WIN32API CreatePolygonRgn(const POINT *lppt, int cPoints, int fnPolyFillMode)
     961ODINFUNCTIONNODBG1(HRGN, CreateEllipticRgnIndirect, const RECT *, pRect)
     962{
     963   return ODIN_CreateEllipticRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);
     964}
     965//******************************************************************************
     966//******************************************************************************
     967ODINFUNCTIONNODBG3(HRGN, CreatePolygonRgn, const POINT *, lppt, int, cPoints, int, fnPolyFillMode)
    966968{
    967969    HRGN hrgn;
     
    10071009//******************************************************************************
    10081010//******************************************************************************
    1009 int WIN32API CombineRgn(HRGN hrgnDest, HRGN hrgnSrc1, HRGN hrgnSrc2, int combineMode)
     1011ODINFUNCTIONNODBG4(int, CombineRgn, HRGN, hrgnDest, HRGN, hrgnSrc1, HRGN, hrgnSrc2, int, combineMode)
    10101012{
    10111013    ULONG lComplexity;
     
    10541056//******************************************************************************
    10551057//******************************************************************************
    1056 BOOL WIN32API EqualRgn(HRGN hrgn1, HRGN hrgn2)
     1058ODINFUNCTIONNODBG2(BOOL, EqualRgn, HRGN, hrgn1, HRGN, hrgn2)
    10571059{
    10581060   LONG lEquality;
     
    10811083//******************************************************************************
    10821084//******************************************************************************
    1083 BOOL WIN32API SetRectRgn(HRGN hrgn, int left, int top, int right, int bottom)
     1085ODINFUNCTIONNODBG5(BOOL, SetRectRgn, HRGN, hrgn, int, left, int, top, int, right, int, bottom)
    10841086{
    10851087   BOOL    result = FALSE;
     
    11011103//******************************************************************************
    11021104//******************************************************************************
    1103 ULONG WIN32API GetRegionData(HRGN hrgn, ULONG count, PRGNDATA pData)
     1105ODINFUNCTIONNODBG3(ULONG, GetRegionData, HRGN, hrgn, ULONG, count, PRGNDATA, pData)
    11041106{
    11051107    if(!count && pData)
     
    11621164//******************************************************************************
    11631165//******************************************************************************
    1164 int WIN32API GetRgnBox(HRGN hrgn, PRECT pRect)
     1166ODINFUNCTIONNODBG2(int, GetRgnBox, HRGN, hrgn, PRECT, pRect)
    11651167{
    11661168   BOOL      success;
     
    11971199//******************************************************************************
    11981200//******************************************************************************
    1199 BOOL WIN32API InvertRgn(HDC hdc, HRGN hrgn)
     1201ODINFUNCTIONNODBG2(BOOL, InvertRgn, HDC, hdc, HRGN, hrgn)
    12001202{
    12011203    pDCData pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    12451247//******************************************************************************
    12461248//******************************************************************************
    1247 int WIN32API OffsetRgn(HRGN hrgn, int xOffset, int yOffset)
     1249ODINFUNCTIONNODBG3(int, OffsetRgn, HRGN, hrgn, int, xOffset, int, yOffset)
    12481250{
    12491251   LONG   lComplexity;
     
    12891291//******************************************************************************
    12901292//******************************************************************************
    1291 BOOL WIN32API FrameRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush, int width, int height)
     1293ODINFUNCTIONNODBG5(BOOL, FrameRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush, int, width, int, height)
    12921294{
    12931295    HBRUSH hbrushRestore = 0;
     
    13311333//******************************************************************************
    13321334//******************************************************************************
    1333 BOOL WIN32API FillRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush)
     1335ODINFUNCTIONNODBG3(BOOL, FillRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush)
    13341336{
    13351337 BOOL   success;
     
    13711373//******************************************************************************
    13721374//******************************************************************************
    1373 BOOL WIN32API PaintRgn(HDC hdc, HRGN hrgn)
     1375ODINFUNCTIONNODBG2(BOOL, PaintRgn, HDC, hdc, HRGN, hrgn)
    13741376{
    13751377   pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    13841386//******************************************************************************
    13851387//******************************************************************************
    1386 BOOL WIN32API PtInRegion( HRGN hrgn, int x, int y)
     1388ODINFUNCTIONNODBG3(BOOL, PtInRegion, HRGN, hrgn, int, x, int, y)
    13871389{
    13881390   BOOL      success;
     
    14141416//******************************************************************************
    14151417//******************************************************************************
    1416 BOOL WIN32API RectInRegion(HRGN hrgn, const RECT *pRect)
     1418ODINFUNCTIONNODBG2(BOOL, RectInRegion, HRGN, hrgn, const RECT *, pRect)
    14171419{
    14181420   BOOL      success;
     
    14561458//Returned region in device coordinates (undocumented behaviour)
    14571459//******************************************************************************
    1458 HRGN WIN32API PathToRegion(HDC hdc)
     1460ODINFUNCTIONNODBG1(HRGN, PathToRegion, HDC, hdc)
    14591461{
    14601462    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
     
    15181520 *****************************************************************************/
    15191521
    1520 int WIN32API GetMetaRgn(HDC  hdc,
    1521                         HRGN hrgn)
     1522ODINFUNCTIONNODBG2(int, GetMetaRgn, HDC,  hdc, HRGN, hrgn)
    15221523{
    15231524  dprintf(("GDI32: GetMetaRgn(%08xh, %08xh) not implemented.\n",
     
    15431544 *****************************************************************************/
    15441545
    1545 BOOL WIN32API SetMetaRgn(HDC hdc)
     1546ODINFUNCTIONNODBG1(BOOL, SetMetaRgn, HDC, hdc)
    15461547{
    15471548  dprintf(("GDI32: SetMetaRgn(%08xh) not implemented.\n",
  • trunk/src/icmp/makefile

    r3619 r3864  
    1 # $Id: makefile,v 1.3 2000-05-27 20:01:34 jeroen Exp $
     1# $Id: makefile,v 1.4 2000-07-19 19:05:07 sandervl Exp $
    22#
    33# icmp.dll makefile
     
    5353$(PDWIN32_LIB)/WSOCK32.LIB
    5454$(RTLLIB_O)
    55 $(PDWIN32_LIB)/odincrt.lib
     55$(PDWIN32_LIB)/$(ODINCRT).lib
    5656$(PDWIN32_LIB)/kernel32.lib
    5757$(TARGET).def
  • trunk/src/imagehlp/makefile

    r3634 r3864  
    1 # $Id: makefile,v 1.10 2000-05-29 22:31:30 sandervl Exp $
     1# $Id: makefile,v 1.11 2000-07-19 19:05:08 sandervl Exp $
    22
    33#
     
    6262$(OBJS)
    6363$(PDWIN32_LIB)/kernel32.lib
    64 $(PDWIN32_LIB)/odincrt.lib
     64$(PDWIN32_LIB)/$(ODINCRT).lib
    6565OS2386.LIB
    6666$(RTLLIB_O)
  • trunk/src/imm32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.9 2000-03-06 23:38:40 bird Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:08 sandervl Exp $
    22
    33#
     
    5757$(TARGET).def
    5858$(PDWIN32_LIB)/kernel32.lib
    59 $(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/$(ODINCRT).lib
    6060OS2386.LIB
    6161$(RTLLIB_O)
  • trunk/src/kernel32/makefile

    r3819 r3864  
    1 # $Id: makefile,v 1.96 2000-07-12 18:21:44 sandervl Exp $
     1# $Id: makefile,v 1.97 2000-07-19 19:05:09 sandervl Exp $
    22
    33#
     
    160160/MAP:$(OBJDIR)\$(TARGET).map
    161161$(OBJS)
    162 $(PDWIN32_LIB)\odincrt.lib
     162$(PDWIN32_LIB)/$(ODINCRT).lib
    163163$(PDWIN32_LIB)\PMWINX.LIB
    164164$(PDWIN32_LIB)\LIBULS.LIB
  • trunk/src/lz32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.11 2000-03-06 23:38:41 bird Exp $
     1# $Id: makefile,v 1.12 2000-07-19 19:05:09 sandervl Exp $
    22
    33#
     
    5555/MAP:$(OBJDIR)\$(TARGET).map
    5656$(OBJS)
    57 $(PDWIN32_LIB)\odincrt.lib
     57$(PDWIN32_LIB)/$(ODINCRT).lib
    5858$(PDWIN32_LIB)\kernel32.lib
    5959os2386.lib
  • trunk/src/mpr/makefile

    r3037 r3864  
    1 # $Id: makefile,v 1.14 2000-03-07 11:08:28 bird Exp $
     1# $Id: makefile,v 1.15 2000-07-19 19:05:10 sandervl Exp $
    22
    33#
     
    6060$(PDWIN32_LIB)/kernel32.lib
    6161$(PDWIN32_LIB)/user32.lib
    62 $(PDWIN32_LIB)/odincrt.lib
     62$(PDWIN32_LIB)/$(ODINCRT).lib
    6363OS2386.LIB
    6464$(RTLLIB_O)
  • trunk/src/msacm32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.10 2000-03-06 23:38:43 bird Exp $
     1# $Id: makefile,v 1.11 2000-07-19 19:05:10 sandervl Exp $
    22
    33#
     
    6262$(PDWIN32_LIB)/pmwinx.lib
    6363$(PDWIN32_LIB)/kernel32.lib
    64 $(PDWIN32_LIB)/odincrt.lib
     64$(PDWIN32_LIB)/$(ODINCRT).lib
    6565$(PDWIN32_LIB)/winmm.lib
    6666$(PDWIN32_LIB)/advapi32.lib
  • trunk/src/msvcrt/makefile

    r3159 r3864  
    1 # $Id: makefile,v 1.16 2000-03-18 19:48:53 sandervl Exp $
     1# $Id: makefile,v 1.17 2000-07-19 19:05:10 sandervl Exp $
    22
    33#
     
    7676$(PDWIN32_LIB)/kernel32.lib
    7777$(PDWIN32_LIB)/crtdll.lib
    78 $(PDWIN32_LIB)/odincrt.lib
     78$(PDWIN32_LIB)/$(ODINCRT).lib
    7979OS2386.LIB
    8080$(RTLLIB_O)
  • trunk/src/msvfw32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.8 2000-03-06 23:38:49 bird Exp $
     1# $Id: makefile,v 1.9 2000-07-19 19:05:11 sandervl Exp $
    22
    33#
     
    5959$(PDWIN32_LIB)/gdi32.lib
    6060$(PDWIN32_LIB)/winmm.lib
    61 $(PDWIN32_LIB)/odincrt.lib
     61$(PDWIN32_LIB)/$(ODINCRT).lib
    6262OS2386.LIB
    6363$(RTLLIB_O)
  • trunk/src/odincrt/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.17 2000-03-06 23:38:49 bird Exp $
     1# $Id: makefile,v 1.18 2000-07-19 19:05:11 sandervl Exp $
    22
    33#
     
    2626
    2727!ifdef VAC36
     28!ifdef DEBUG
     29RUNTIMELIBDEF   = odin36d.def
     30!else
    2831RUNTIMELIBDEF   = odin36.def
     32!endif
     33!else
     34!ifdef DEBUG
     35RUNTIMELIBDEF   = odincrtd.def
    2936!else
    3037RUNTIMELIBDEF   = odincrt.def
     38!endif
    3139!endif
    3240
     
    4250
    4351# Target name - name of the dll without extention and path.
    44 TARGET = odincrt
     52TARGET = $(ODINCRT)
    4553
    4654
  • trunk/src/ole32/makefile

    r3309 r3864  
    1 # $Id: makefile,v 1.24 2000-04-02 22:07:34 davidr Exp $
     1# $Id: makefile,v 1.25 2000-07-19 19:05:12 sandervl Exp $
    22
    33#
     
    9393$(PDWIN32_LIB)/kernel32.lib
    9494$(PDWIN32_LIB)/oleaut32.lib
    95 $(PDWIN32_LIB)/odincrt.lib
     95$(PDWIN32_LIB)/$(ODINCRT).lib
    9696OS2386.LIB
    9797$(RTLLIB_O)
     
    112112                $(PDWIN32_LIB)/ole32.lib
    113113    $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
    114         $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     114        $(PDWIN32_LIB)/$(ODINCRT).lib OS2386.LIB $(RTLLIB_O)
    115115
    116116$(PDWIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
  • trunk/src/oleaut32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.17 2000-03-06 23:38:51 bird Exp $
     1# $Id: makefile,v 1.18 2000-07-19 19:05:12 sandervl Exp $
    22
    33#
     
    8585$(PDWIN32_LIB)/ole32.lib
    8686$(PDWIN32_LIB)/gdi32.lib
    87 $(PDWIN32_LIB)/odincrt.lib
     87$(PDWIN32_LIB)/$(ODINCRT).lib
    8888OS2386.LIB
    8989$(RTLLIB_O)
  • trunk/src/olecli32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.9 2000-03-06 23:38:51 bird Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:12 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/oledlg/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.9 2000-03-06 23:38:52 bird Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:13 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/olepro32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.2 2000-03-06 23:38:53 bird Exp $
     1# $Id: makefile,v 1.3 2000-07-19 19:05:13 sandervl Exp $
    22
    33#
     
    5757$(PDWIN32_LIB)/kernel32.lib
    5858$(PDWIN32_LIB)/oleaut32.lib
    59 $(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/$(ODINCRT).lib
    6060OS2386.LIB
    6161$(RTLLIB_O)
  • trunk/src/olesvr32/makefile

    r3037 r3864  
    1 # $Id: makefile,v 1.10 2000-03-07 11:10:02 bird Exp $
     1# $Id: makefile,v 1.11 2000-07-19 19:05:13 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/opengl/glide/cvg/makefile

    r3606 r3864  
    1 # $Id: makefile,v 1.9 2000-05-26 15:03:08 bird Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:13 sandervl Exp $
    22
    33#
     
    7676glide\$(OBJDIR)\glide.lib
    7777$(PDWIN32_LIB)\kernel32.lib
    78 $(PDWIN32_LIB)\odincrt.lib
     78$(PDWIN32_LIB)/$(ODINCRT).lib
    7979OS2386.LIB
    8080$(RTLLIB_O)
  • trunk/src/opengl/glide/sst1/makefile

    r3606 r3864  
    1 # $Id: makefile,v 1.6 2000-05-26 15:03:09 bird Exp $
     1# $Id: makefile,v 1.7 2000-07-19 19:05:14 sandervl Exp $
    22
    33#
     
    7777glide\$(OBJDIR)\glide.lib
    7878$(PDWIN32_LIB)\kernel32.lib
    79 $(PDWIN32_LIB)\odincrt.lib
     79$(PDWIN32_LIB)/$(ODINCRT).lib
    8080OS2386.LIB
    8181$(RTLLIB_O)
  • trunk/src/opengl/glu/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.12 2000-03-06 23:33:48 bird Exp $
     1# $Id: makefile,v 1.13 2000-07-19 19:05:14 sandervl Exp $
    22
    33#
     
    7777tess\$(OBJDIR)\tess.lib
    7878util\$(OBJDIR)\util.lib
    79 $(PDWIN32_LIB)\ODINCRT.LIB
     79$(PDWIN32_LIB)/$(ODINCRT).lib
    8080$(PDWIN32_LIB)\KERNEL32.LIB
    8181$(PDWIN32_LIB)\OPENGL32.LIB
  • trunk/src/opengl/glut/Makefile

    r3083 r3864  
    1 # $Id: Makefile,v 1.14 2000-03-11 15:07:43 sandervl Exp $
     1# $Id: Makefile,v 1.15 2000-07-19 19:05:15 sandervl Exp $
    22
    33#
     
    105105/MAP:$(OBJDIR)\$(TARGET).map
    106106$(OBJS)
    107 $(PDWIN32_LIB)\ODINCRT.LIB
     107$(PDWIN32_LIB)/$(ODINCRT).lib
    108108$(RTLLIB_O)
    109109$(PDWIN32_LIB)\WINMM.LIB
  • trunk/src/opengl/mesa/3dfx/makefile

    r3598 r3864  
    1 # $Id: makefile,v 1.9 2000-05-23 20:41:24 jeroen Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:16 sandervl Exp $
    22#
    33# Odin32 API
     
    162162/MAP:$(OBJDIR)\$(TARGET).map
    163163$(OBJS)
    164 $(PDWIN32_LIB)\ODINCRT.LIB
     164$(PDWIN32_LIB)/$(ODINCRT).lib
    165165$(PDWIN32_LIB)\KERNEL32.LIB
    166166$(PDWIN32_LIB)\GDI32.LIB
  • trunk/src/opengl/mesa/makefile

    r3598 r3864  
    1 # $Id: makefile,v 1.7 2000-05-23 20:40:40 jeroen Exp $
     1# $Id: makefile,v 1.8 2000-07-19 19:05:15 sandervl Exp $
    22
    33#
     
    144144/MAP:$(OBJDIR)\$(TARGET).map
    145145$(OBJS)
    146 $(PDWIN32_LIB)\ODINCRT.LIB
     146$(PDWIN32_LIB)/$(ODINCRT).lib
    147147$(PDWIN32_LIB)\KERNEL32.LIB
    148148$(PDWIN32_LIB)\GDI32.LIB
  • trunk/src/psapi/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.8 2000-03-06 23:38:55 bird Exp $
     1# $Id: makefile,v 1.9 2000-07-19 19:05:16 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/rasapi32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.9 2000-03-06 23:38:56 bird Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:21 sandervl Exp $
    22
    33#
     
    5656$(OBJS)
    5757$(PDWIN32_LIB)/kernel32.lib
    58 $(PDWIN32_LIB)/odincrt.lib
     58$(PDWIN32_LIB)/$(ODINCRT).lib
    5959OS2386.LIB
    6060$(RTLLIB_O)
  • trunk/src/riched32/makefile

    r3515 r3864  
    1 # $Id: makefile,v 1.1 2000-05-10 13:17:27 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-07-19 19:05:21 sandervl Exp $
    22
    33#
     
    6666$(PDWIN32_LIB)/kernel32.lib
    6767$(PDWIN32_LIB)/user32.lib
    68 $(PDWIN32_LIB)/odincrt.lib
     68$(PDWIN32_LIB)/$(ODINCRT).lib
    6969OS2386.LIB
    7070$(RTLLIB_O)
  • trunk/src/rpcrt4/makefile

    r3317 r3864  
    1 # $Id: makefile,v 1.2 2000-04-04 19:49:03 davidr Exp $
     1# $Id: makefile,v 1.3 2000-07-19 19:05:21 sandervl Exp $
    22
    33#
     
    6161$(OBJS)
    6262$(PDWIN32_LIB)/kernel32.lib
    63 $(PDWIN32_LIB)/odincrt.lib
     63$(PDWIN32_LIB)/$(ODINCRT).lib
    6464OS2386.LIB
    6565so32dll.lib
  • trunk/src/shell32/makefile

    r3554 r3864  
    1 # $Id: makefile,v 1.25 2000-05-18 18:06:59 sandervl Exp $
     1# $Id: makefile,v 1.26 2000-07-19 19:05:22 sandervl Exp $
    22
    33#
     
    9191$(PDWIN32_LIB)/version.lib
    9292$(PDWIN32_LIB)/comctl32.lib
    93 $(PDWIN32_LIB)/odincrt.lib
     93$(PDWIN32_LIB)/$(ODINCRT).lib
    9494$(PDWIN32_LIB)/shlwapi.lib
    9595OS2386.LIB
  • trunk/src/shlwapi/makefile

    r3700 r3864  
    1 # $Id: makefile,v 1.16 2000-06-13 18:14:17 phaller Exp $
     1# $Id: makefile,v 1.17 2000-07-19 19:05:22 sandervl Exp $
    22
    33#
     
    6565$(PDWIN32_LIB)/user32.lib
    6666$(PDWIN32_LIB)/gdi32.lib
    67 $(PDWIN32_LIB)/odincrt.lib
     67$(PDWIN32_LIB)/$(ODINCRT).lib
    6868$(PDWIN32_LIB)/crtdll.lib
    6969OS2386.LIB
  • trunk/src/tapi32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.14 2000-03-06 23:39:10 bird Exp $
     1# $Id: makefile,v 1.15 2000-07-19 19:05:22 sandervl Exp $
    22
    33#
     
    5757$(PDWIN32_LIB)/kernel32.lib
    5858$(PDWIN32_LIB)/user32.lib
    59 $(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/$(ODINCRT).lib
    6060OS2386.LIB
    6161$(RTLLIB_O)
  • trunk/src/twain_32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.5 2000-03-06 23:39:11 bird Exp $
     1# $Id: makefile,v 1.6 2000-07-19 19:05:23 sandervl Exp $
    22
    33#
     
    6161$(PDWIN32_LIB)/kernel32.lib
    6262$(PDWIN32_LIB)/user32.lib
    63 $(PDWIN32_LIB)/odincrt.lib
     63$(PDWIN32_LIB)/$(ODINCRT).lib
    6464OS2386.LIB
    6565$(RTLLIB_O)
  • trunk/src/urlmon/makefile

    r3633 r3864  
    1 # $Id: makefile,v 1.1 2000-05-29 22:30:38 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-07-19 19:05:23 sandervl Exp $
    22
    33#
     
    5858$(PDWIN32_LIB)/kernel32.lib
    5959$(PDWIN32_LIB)/ole32.lib
    60 $(PDWIN32_LIB)/odincrt.lib
     60$(PDWIN32_LIB)/$(ODINCRT).lib
    6161OS2386.LIB
    6262$(RTLLIB_O)
  • trunk/src/user32/Makefile

    r3679 r3864  
    1 # $Id: Makefile,v 1.72 2000-06-08 18:10:08 sandervl Exp $
     1# $Id: Makefile,v 1.73 2000-07-19 19:05:24 sandervl Exp $
    22
    33#
     
    123123$(PDWIN32_LIB)/kernel32.lib
    124124$(PDWIN32_LIB)/libuls.lib
    125 $(PDWIN32_LIB)/odincrt.lib
     125$(PDWIN32_LIB)/$(ODINCRT).lib
    126126OS2386.LIB
    127127$(RTLLIB_O)
  • trunk/src/user32/dc.cpp

    r3853 r3864  
    1 /* $Id: dc.cpp,v 1.67 2000-07-18 18:35:38 sandervl Exp $ */
     1/* $Id: dc.cpp,v 1.68 2000-07-19 19:05:24 sandervl Exp $ */
    22
    33/*
     
    10031003// RDW_FRAME
    10041004//
    1005 //TODO: Work ok for RDW_FRAME??
     1005//TODO: Works ok for RDW_FRAME??
    10061006//******************************************************************************
    10071007BOOL WIN32API RedrawWindow(HWND hwnd, const RECT* pRect, HRGN hrgn, DWORD redraw)
  • trunk/src/user32/pmwindow.cpp

    r3800 r3864  
    1 /* $Id: pmwindow.cpp,v 1.98 2000-07-04 08:42:06 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.99 2000-07-19 19:05:24 sandervl Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
     
    948948  LONG      parentHeight, parentWidth;
    949949
     950   dprintf(("FrameTrackFrame: %x %x", win32wnd->getWindowHandle(), flags));
    950951   track.cxBorder = 4;
    951952   track.cyBorder = 4;  /* 4 pel wide lines used for rectangle */
  • trunk/src/version/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.13 2000-03-06 23:39:14 bird Exp $
     1# $Id: makefile,v 1.14 2000-07-19 19:05:25 sandervl Exp $
    22
    33#
     
    5959$(PDWIN32_LIB)/kernel32.lib
    6060$(PDWIN32_LIB)/user32.lib
    61 $(PDWIN32_LIB)/odincrt.lib
     61$(PDWIN32_LIB)/$(ODINCRT).lib
    6262$(PDWIN32_LIB)/crtdll.lib
    6363$(PDWIN32_LIB)/lz32.lib
  • trunk/src/wing32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.7 2000-03-06 23:39:15 bird Exp $
     1# $Id: makefile,v 1.8 2000-07-19 19:05:26 sandervl Exp $
    22
    33#
     
    5959$(PDWIN32_LIB)/gdi32.lib
    6060$(PDWIN32_LIB)/kernel32.lib
    61 $(PDWIN32_LIB)/odincrt.lib
     61$(PDWIN32_LIB)/$(ODINCRT).lib
    6262OS2386.LIB
    6363$(RTLLIB_O)
  • trunk/src/wininet/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.7 2000-03-06 23:39:16 bird Exp $
     1# $Id: makefile,v 1.8 2000-07-19 19:05:26 sandervl Exp $
    22
    33#
     
    5959$(OBJS)
    6060$(PDWIN32_LIB)/kernel32.lib \
    61 $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
     61$(PDWIN32_LIB)/user32.lib \
     62$(PDWIN32_LIB)/$(ODINCRT).lib \
    6263$(PDWIN32_LIB)/wsock32.lib
    6364OS2386.LIB $(RTLLIB_O)
  • trunk/src/winmm/makefile

    r3037 r3864  
    1 # $Id: makefile,v 1.18 2000-03-07 11:11:10 bird Exp $
     1# $Id: makefile,v 1.19 2000-07-19 19:05:26 sandervl Exp $
    22
    33#
     
    4949TARGET = winmm
    5050
     51LDFLAGS = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /NOD /dbgpack /packcode /packdata /exepack:2"
    5152
    5253# All rule - build objs, target dll, copies dll to bin and makes libs.
     
    7677$(PDWIN32_LIB)/kernel32.lib
    7778$(PDWIN32_LIB)/user32.lib
    78 $(PDWIN32_LIB)/odincrt.lib
     79$(PDWIN32_LIB)/$(ODINCRT).lib
    7980OS2386.LIB
    8081$(RTLLIB_O)
  • trunk/src/winspool/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.13 2000-03-06 23:39:18 bird Exp $
     1# $Id: makefile,v 1.14 2000-07-19 19:05:26 sandervl Exp $
    22
    33#
     
    5858$(PDWIN32_LIB)/pmwinx.lib
    5959$(PDWIN32_LIB)/user32.lib
    60 $(PDWIN32_LIB)/odincrt.lib
     60$(PDWIN32_LIB)/$(ODINCRT).lib
    6161OS2386.LIB
    6262$(RTLLIB_O)
  • trunk/src/wnaspi32/makefile

    r3541 r3864  
    1 # $Id: makefile,v 1.9 2000-05-15 19:02:20 sandervl Exp $
     1# $Id: makefile,v 1.10 2000-07-19 19:05:27 sandervl Exp $
    22
    33#
     
    5757$(OBJS)
    5858$(PDWIN32_LIB)/kernel32.lib
    59 $(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/$(ODINCRT).lib
    6060OS2386.LIB
    6161$(RTLLIB_O)
  • trunk/src/wnetap32/makefile

    r3031 r3864  
    1 # $Id: makefile,v 1.11 2000-03-06 23:39:19 bird Exp $
     1# $Id: makefile,v 1.12 2000-07-19 19:05:27 sandervl Exp $
    22
    33#
     
    5858$(PDWIN32_LIB)/kernel32.lib
    5959$(PDWIN32_LIB)/user32.lib
    60 $(PDWIN32_LIB)/odincrt.lib
     60$(PDWIN32_LIB)/$(ODINCRT).lib
    6161OS2386.LIB $(RTLLIB_O)
    6262$(ORGTARGET).def
  • trunk/src/wsock32/makefile

    r3233 r3864  
    1 # $Id: makefile,v 1.26 2000-03-24 23:14:29 sandervl Exp $
     1# $Id: makefile,v 1.27 2000-07-19 19:05:27 sandervl Exp $
    22
    33#
     
    6868$(PDWIN32_LIB)\kernel32.lib
    6969$(PDWIN32_LIB)/user32.lib
    70 $(PDWIN32_LIB)/odincrt.lib
     70$(PDWIN32_LIB)/$(ODINCRT).lib
    7171OS2386.LIB
    7272$(RTLLIB_O)
Note: See TracChangeset for help on using the changeset viewer.