Changeset 5331 for trunk

Timestamp:

Mar 19, 2001, 7:56:57 PM (25 years ago)

Author:

mike

Message:

Few Watcom fixes/updates

Location:

trunk

Files:

• changelog (modified) (2 diffs)
• doc/Odin.ini.txt (modified) (3 diffs)
• include/initdll.h (modified) (2 diffs)
• include/odin32.dbg.wat.mk (modified) (3 diffs)
• include/odin32.post.wat.mk (modified) (2 diffs)
• include/odin32.tools.wat.mk (modified) (2 diffs)
• src/dsound/OS2SNDBUFFER.CPP (modified) (2 diffs)

trunk/changelog

@@ -1 @@
-/* $Id: changelog,v 1.1308 2001-03-19 14:54:03 bird Exp $ */
+/* $Id: changelog,v 1.1309 2001-03-19 18:56:55 mike Exp $ */
+
+ 2001-03-19: Michal Necasek <michalnec@volny.cz>
+    - include:  o Few updates/fixes for wmake. Enabled .AUTOEPEND which
+                  seems to be working fine for DSOUND
 
  2001-03-19: knut st. osmundsen <knut.stange.osmundsen@mynd.no>
@@ -5 +9 @@
                   now work as executed thru pec.exe.
     - Kernel32: o Init VIO Console for Pe2Lx CUI images.
-
- 2001-03-18: Michal Necasek <michalnec@volny.cz>
-    - DDRAW:    o Finally merged DDRAW and DDRAW\NEW. A new key in ODIN.INI
-                  controls which version to use:
 
                   [DirectDraw]

trunk/doc/Odin.ini.txt

@@ -1 @@
-/* $Id: Odin.ini.txt,v 1.3 2001-03-13 18:52:03 sandervl Exp $ */
+/* $Id: Odin.ini.txt,v 1.4 2001-03-19 18:56:56 mike Exp $ */
 
 Odin initialization file documentation
 
 [COLORS]
-UseWinColors    Use Windows colors
-                values: 1/0
-                default: 1
-SaveColors      Save/restore colors to/from Odin.ini
-                values: 1/0
-                default: 0
+UseWinColors    Use Windows colors
+                values: 1/0
+                default: 1
+SaveColors      Save/restore colors to/from Odin.ini
+                values: 1/0
+                default: 0
 
 [DLLRENAMEWIN]
@@ -29 +29 @@
 
 [TWAIN]
-TwainIF         values 1,2,3 (default=1)
-                1 -> Use CFM Twain Driver
-                2 -> Use STI Twain Driver (not supported at the moment)
-                3 -> Use SANE Driver (not supported at the moment)
+TwainIF         values 1,2,3 (default=1)
+                1 -> Use CFM Twain Driver
+                2 -> Use STI Twain Driver (not supported at the moment)
+                3 -> Use SANE Driver (not supported at the moment)
 
 [CODEPAGES]
@@ -38 +38 @@
 Display         Display codepage (i.e. 1251 for Cyrillic)
 
+[DirectDraw]
+Fullscreen=[1|0]  Use/don't use fullscreen DirectDraw
+
 Odin.ini is stored in the directory where the environment string
 ODIN_INI points to. The default path is the directory of

trunk/include/initdll.h

@@ -13 +13 @@
 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
 void _Optlink __ctordtorInit( void );
-#define ctordtorInit()  __ctordtorInit()
+#define ctordtorInit()  __ctordtorInit()
 
 void _Optlink __ctordtorTerm( void );
-#define ctordtorTerm()  __ctordtorTerm()
+#define ctordtorTerm()  __ctordtorTerm()
 
 #elif (__IBMCPP__ == 360) || (__IBMC__ == 360)
 void _Optlink __ctordtorInit( int flag );
-#define ctordtorInit()  __ctordtorInit(0)
+#define ctordtorInit()  __ctordtorInit(0)
 
 void _Optlink __ctordtorTerm( int flag );
-#define ctordtorTerm()  __ctordtorTerm(0)
+#define ctordtorTerm()  __ctordtorTerm(0)
 
 #else
@@ -56 +56 @@
 #define ctordtorTerm()
 
+#ifdef __cplusplus
+extern "C" {
+//prevent Watcom from mucking with this name
+extern DWORD _Resource_PEResTab;
+#pragma aux _Resource_PEResTab "*";
+}
+#endif
+
 #endif
 

trunk/include/odin32.dbg.wat.mk

@@ -1 @@
-# $Id: odin32.dbg.wat.mk,v 1.3 2000-12-17 19:54:55 bird Exp $
+# $Id: odin32.dbg.wat.mk,v 1.4 2001-03-19 18:56:56 mike Exp $
 
 #
@@ -19 +19 @@
 SOMLIB   = somtk.lib
 RTLLIB   = clib3r.lib
-RTLLIB_O = clib3r.lib
+RTLLIB_O = clib3r.lib plbrdll.lib mt7rdll.lib
 DLLENTRY = $(ODIN32_LIB)\dllentry.obj
 ODINCRT  = odincrtd
@@ -112 +112 @@
 # Linker flags.
 #
-LDFLAGS          = option maxe=125, quiet, symfile, nodefaultlibs  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
-LDFLAGS_ODINCRT  = option maxe=125, quiet, symfile  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
+LDFLAGS          = option maxe=125, caseexact, quiet, symfile, nodefaultlibs  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
+LDFLAGS_ODINCRT  = option maxe=125, caseexact, quiet, symfile  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
 
 !ifndef NODEBUGINFO

trunk/include/odin32.post.wat.mk

@@ -1 @@
-# $Id: odin32.post.wat.mk,v 1.11 2001-03-06 21:44:39 mike Exp $
+# $Id: odin32.post.wat.mk,v 1.12 2001-03-19 18:56:56 mike Exp $
 
 #
@@ -112 +112 @@
 lib:    $(OBJDIR) \
         $(OBJDIR)\$(ORGTARGET).lib \
-        $(ODIN32_LIB)\$(ORGTARGET).lib
+        $(ODIN32_LIB)\$(ORGTARGET).lib \
+        .SYMBOLIC
 !endif
 

trunk/include/odin32.tools.wat.mk

@@ -1 @@
-# $Id: odin32.tools.wat.mk,v 1.3 2001-03-06 21:44:39 mike Exp $
+# $Id: odin32.tools.wat.mk,v 1.4 2001-03-19 18:56:56 mike Exp $
 
 #
@@ -54 +54 @@
 .res : $(OBJDIR)
 
-.c.obj:   # .AUTODEPEND
+.c.obj:   .AUTODEPEND
     $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -fo$(OBJDIR)\$^&.obj $^&.c
 
-.cpp.obj: # .AUTODEPEND
+.cpp.obj: .AUTODEPEND
     $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -fo$(OBJDIR)\$^&.obj $^&.cpp
 

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -1 @@
-/* $Id: OS2SNDBUFFER.CPP,v 1.10 2001-03-10 06:21:06 mike Exp $ */
+/* $Id: OS2SNDBUFFER.CPP,v 1.11 2001-03-19 18:56:57 mike Exp $ */
 
 /*
@@ -548 +548 @@
    OS2IDirectSoundBuffer *me = (OS2IDirectSoundBuffer *)This;
 
-   ULONG ulBytesToPlay;
-
    dprintf(("DSOUND-OS2IDirectSoundBuffer::SoundBufPlay (buf=%X)", me));
    if (me == NULL) {