Changeset 2650 for trunk/src/ddraw


Ignore:
Timestamp:
Feb 5, 2000, 3:19:44 AM (26 years ago)
Author:
sandervl
Message:

Added version resource

Location:
trunk/src/ddraw
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ddraw/initterm.cpp

    r1502 r2650  
    1 /* $Id: initterm.cpp,v 1.11 1999-10-28 22:39:21 hugh Exp $ */
     1/* $Id: initterm.cpp,v 1.12 2000-02-05 01:55:52 sandervl Exp $ */
    22
    33/*
    … …  
    3333#include <odin.h>
    3434#include <win32type.h>
     35#include <winconst.h>
    3536#include <odinlx.h>
    3637#include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
    37 #include "initterm.h"
    3838
    3939extern "C" {
    4040void CDECL _ctordtorInit( void );
    4141void CDECL _ctordtorTerm( void );
     42
     43 //Win32 resource table (produced by wrc)
     44 extern DWORD _Resource_PEResTab;
    4245}
    4346
    4447char ddrawPath[CCHMAXPATH] = "";
    4548
    46 /*-------------------------------------------------------------------*/
    47 /* A clean up routine registered with DosExitList must be used if    */
    48 /* runtime calls are required and the runtime is dynamically linked. */
    49 /* This will guarantee that this clean up routine is run before the  */
    50 /* library DLL is terminated.                                        */
    51 /*-------------------------------------------------------------------*/
    52 static void APIENTRY cleanup(ULONG reason);
     49//******************************************************************************
     50//******************************************************************************
     51BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
     52{
     53   switch (fdwReason)
     54   {
     55   case DLL_PROCESS_ATTACH:
     56        return TRUE;
    5357
     58   case DLL_THREAD_ATTACH:
     59   case DLL_THREAD_DETACH:
     60        return TRUE;
    5461
     62   case DLL_PROCESS_DETACH:
     63        _ctordtorTerm();
     64        return TRUE;
     65   }
     66   return FALSE;
     67}
    5568/****************************************************************************/
    5669/* _DLL_InitTerm is the function that gets called by the operating system   */
    … …  
    7891         _ctordtorInit();
    7992
    80    DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
     93         DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
    8194         char *endofpath = strrchr(ddrawPath, '\\');
    8295         if(endofpath) *(endofpath+1) = 0;
    … …  
    8497         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    8598
    86          /*******************************************************************/
    87          /* A DosExitList routine must be used to clean up if runtime calls */
    88          /* are required and the runtime is dynamically linked.             */
    89          /*******************************************************************/
    90 
    91    if(RegisterLxDll(hModule, 0, 0) == FALSE)
    92     return 0UL;
    93 
    94          rc = DosExitList(0x0000F000|EXLST_ADD, cleanup);
    95          if(rc)
    96                 return 0UL;
     99         if(RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab) == FALSE)
     100                return 0UL;
    97101
    98102         break;
    99103      }
    100104      case 1 :
    101   UnregisterLxDll(hModule);
     105        UnregisterLxDll(hModule);
    102106         break;
    103107      default  :
    … …  
    110114   return 1UL;
    111115}
    112 
    113 
    114 static void APIENTRY cleanup(ULONG ulReason)
    115 {
    116    _ctordtorTerm();
    117    DosExitList(EXLST_EXIT, cleanup);
    118    return ;
    119 }
     116//******************************************************************************
     117//******************************************************************************

  • trunk/src/ddraw/makefile

    r2638 r2650  
    1 # $Id: makefile,v 1.17 2000-02-04 19:31:26 hugh Exp $
     1# $Id: makefile,v 1.18 2000-02-05 01:55:52 sandervl Exp $
    22#
    33# ddraw.dll makefile
    … …  
    1313PDWIN32_LIB = ..\..\lib
    1414PDWIN32_BIN = ..\..\bin
     15PDWIN32_TOOLS = ..\..\tools\bin
    1516
    1617
    1718!include $(PDWIN32_INCLUDE)/pdwin32.mk
     19
    1820ASFLAGS = -Sc -Sv:ALP
    1921
    … …  
    2527OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj iccio1.obj asmutil.obj\
    2628        os2surface.obj os2palette.obj os2palset.obj rectangle.obj initterm.obj \
    27         os2util.obj bltFunc.obj fillfunc.obj colorconv.obj
     29        os2util.obj bltFunc.obj fillfunc.obj colorconv.obj resource.obj
    2830
    2931
    3032LIBS =  $(PDWIN32_LIB)\pmwinx.lib $(PDWIN32_LIB)\advapi32.lib $(PDWIN32_LIB)\gdi32.lib \
    3133        $(PDWIN32_LIB)\comctl32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\odincrt.lib \
    32         $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)\ole32.lib mmpm2.lib OS2386.LIB $(RTLLIB_O)
     34        $(PDWIN32_LIB)\user32.lib mmpm2.lib OS2386.LIB $(RTLLIB_O)
    3335
    3436all: $(TARGET).dll $(TARGET).lib
    … …  
    8991    $(PDWIN32_INCLUDE)\win\d3d.h
    9092
     93resource.asm: $(TARGET).rc
     94    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     95
     96resource.obj: resource.asm
     97
    9198rectangle.obj: rectangle.cpp rectangle.h
    9299
    93 initterm.obj: initterm.cpp initterm.h
     100initterm.obj: initterm.cpp initterm.h $(PDWIN32_INCLUDE)\exitlist.h
    94101
    95102os2util.obj:  os2util.cpp os2util.h
Note: See TracChangeset for help on using the changeset viewer.