Changeset 5288 for trunk/include


Ignore:
Timestamp:
Mar 6, 2001, 10:44:40 PM (25 years ago)
Author:
mike
Message:

Changes/fixes/updates for building with Watcom

Location:
trunk/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin.h

    r5148 r5288  
    5151  #define WIN32API  __stdcall
    5252  #define WINAPI    __stdcall
    53   #define SYSTEM    __stdcall
     53  #define SYSTEM    _System
    5454  #define PASCAL    __stdcall
    5555  #define UNALIGNED
     56
     57//MN: For some strange reason Watcom doesn't define these for C++!
     58//    This is not the best place to define them though.
     59#ifdef __cplusplus
     60  #define min(a,b)  (((a) < (b)) ? (a) : (b))
     61  #define max(a,b)  (((a) > (b)) ? (a) : (b))
     62#endif
     63
    5664#else
    5765

  • trunk/include/odin32.post.wat.mk

    r4992 r5288  
    1 # $Id: odin32.post.wat.mk,v 1.10 2001-01-20 18:18:56 bird Exp $
     1# $Id: odin32.post.wat.mk,v 1.11 2001-03-06 21:44:39 mike Exp $
    22
    33#
    … …  
    358358!ifndef NOTEXPDEF
    359359$(OBJDIR)\$(ORGTARGET).lib: $(OBJDIR)\$(ORGTARGET)exp.def
    360     $(IMPLIB) $(IMPLIBFLAGS) $[@
     360    $(IMPLIB) $(IMPLIBFLAGS) $@ $[@
    361361!else
    362362$(OBJDIR)\$(TARGET).lib: $(DEFFILE)
    … …  
    382382$(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
    383383    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
    384         -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
    385         -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\odinbuild.h"
     384        -V"$#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
     385        -M"$#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\odinbuild.h"
    386386
    387387

  • trunk/include/odin32.rel.wat.mk

    r4826 r5288  
    1 # $Id: odin32.rel.wat.mk,v 1.3 2000-12-17 19:54:56 bird Exp $
     1# $Id: odin32.rel.wat.mk,v 1.4 2001-03-06 21:44:39 mike Exp $
    22
    33#
    … …  
    1919SOMLIB   = somtk.lib
    2020RTLLIB   = clib3r.lib
    21 RTLLIB_O = clib3r.lib
     21RTLLIB_O = clib3r.lib plbrdll.lib mt7rdll.lib
    2222DLLENTRY = $(ODIN32_LIB)\dllentry.obj
    2323ODINCRT  = odincrtd

  • trunk/include/odin32.tools.wat.mk

    r4770 r5288  
    1 # $Id: odin32.tools.wat.mk,v 1.2 2000-12-09 16:04:23 phaller Exp $
     1# $Id: odin32.tools.wat.mk,v 1.3 2001-03-06 21:44:39 mike Exp $
    22
    33#
    44# Odin32 API
    55#
    6 #       Watcom C/C++ 11.x tools and interference rules.
     6#       Watcom C/C++ 11.x tools and inference rules.
    77#
    88
    … …  
    1111# Watcom Specific tools
    1212#
    13 MAPSYM   = ..\..\$(ODIN32_TOOLS)\mapsymWat.cmd
     13MAPSYM   = $(ODIN32_TOOLS)\mapsymWat.cmd
    1414KDEF2WAT = $(ODIN32_TOOLS)\kDef2Wat.exe
    1515

  • trunk/include/odinlx.h

    r4930 r5288  
    1 /* $Id: odinlx.h,v 1.6 2001-01-11 18:03:48 sandervl Exp $ */
     1/* $Id: odinlx.h,v 1.7 2001-03-06 21:44:39 mike Exp $ */
    22
    33/*
    … …  
    1717#include <versionos2.h>
    1818
     19extern "C" {
     20
    1921typedef ULONG (* WIN32API WIN32DLLENTRY)(ULONG hInstance, ULONG reason, LPVOID reserved);
    2022typedef int (* WIN32API WINMAIN)(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nShowCmd);
    … …  
    2426//System dlls set EntryPoint to 0
    2527//Parameters:
    26 //  HINSTANCE hInstance         - OS/2 module handle
     28//  HINSTANCE hInstance         - OS/2 module handle
    2729//  WIN32DLLENTRY EntryPoint    - Win32 dll entrypoint address
    2830//  PVOID pResData              - pointer to win32 resource data
    … …  
    3436//Returns: Odin32 module handle
    3537//******************************************************************************
    36 DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, 
    37                              PVOID pResData, 
    38                              DWORD MajorImageVersion = ODINNT_MAJOR_VERSION, 
     38DWORD WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint,
     39                             PVOID pResData,
     40                             DWORD MajorImageVersion = ODINNT_MAJOR_VERSION,
    3941                             DWORD MinorImageVersion = ODINNT_MINOR_VERSION,
    4042                             DWORD Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI);
    … …  
    5052//******************************************************************************
    5153BOOL WIN32API RegisterLxExe(WINMAIN EntryPoint, PVOID pResData);
    52 
     54}
    5355#endif

  • trunk/include/win/wine/dd_obj_base.h

    r2640 r5288  
    1 /* $Id: dd_obj_base.h,v 1.3 2000-02-04 23:12:19 hugh Exp $ */
     1/* $Id: dd_obj_base.h,v 1.4 2001-03-06 21:44:39 mike Exp $ */
    22/*
    33 * This file defines the macros and types necessary to define COM interfaces,
    … …  
    88  #define __WINE_DD_OBJ_BASE_H
    99
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
    1013
    1114/*****************************************************************************
    … …  
    679682#endif
    680683
     684#ifdef __cplusplus
     685}
     686#endif
    681687
    682688#endif /* __WINE_WINE_OBJ_BASE_H */
Note: See TracChangeset for help on using the changeset viewer.