Changeset 10975

Timestamp:

Jul 21, 1999, 9:25:06 AM (26 years ago)

Author:

sandervl

Message:

Getting rid of some linker errors

Location:

tags/trunk/src/ddraw

Files:

• OS2DDRAW.H (modified) (1 diff)
• initterm.cpp (modified) (4 diffs)
• makefile (modified) (1 diff)

tags/trunk/src/ddraw/OS2DDRAW.H ¶

@@ -4 +4 @@
 #include <ddraw.h>
 #include <d3d.h>
+#undef APIENTRY
+#define APIENTRY _System
 #include <dive.h>
 

tags/trunk/src/ddraw/initterm.cpp ¶

@@ -30 +30 @@
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:29*/
 
+extern "C" {
 /*-------------------------------------------------------------------*/
 /* _CRT_init is the C run-time environment initialization function.  */
 /* It will return 0 to indicate success and -1 to indicate failure.  */
 /*-------------------------------------------------------------------*/
-int _CRT_init(void);
+int CDECL CRT_init(void);
 /*-------------------------------------------------------------------*/
 /* _CRT_term is the C run-time environment termination function.     */
@@ -40 +41 @@
 /* statically linked.                                                */
 /*-------------------------------------------------------------------*/
-void _CRT_term(void);
-void __ctordtorInit( void );
-void __ctordtorTerm( void );
-
+void CDECL CRT_term(void);
+void CDECL _ctordtorInit( void );
+void CDECL _ctordtorTerm( void );
+}
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -83 +84 @@
          /*******************************************************************/
 
-         if (_CRT_init() == -1)
+         if (CRT_init() == -1)
             return 0UL;
-     __ctordtorInit();
+     _ctordtorInit();
 
 //SvL: Temporarily disabled
@@ -117 +118 @@
 static void APIENTRY cleanup(ULONG ulReason)
 {
-   __ctordtorTerm();
-   _CRT_term();
+   _ctordtorTerm();
+   CRT_term();
    DosExitList(EXLST_EXIT, cleanup);
    return ;

tags/trunk/src/ddraw/makefile ¶

@@ -21 +21 @@
         os2surface.obj os2palette.obj os2palset.obj misc.obj rectangle.obj initterm.obj
 
-LIBS =  ..\..\lib\pmwinx.lib mmpm2.lib ..\..\lib\comctl32.lib
+LIBS =  ..\..\lib\pmwinx.lib mmpm2.lib ..\..\lib\comctl32.lib $(PDWIN32_LIB)\advapi32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\gdi32.lib
 
 all: $(TARGET).dll $(TARGET).lib