Another Watcom build fix, however, it doesn't fixes stack-related troubles

6 files changed, 246 insertions, 354 deletions

diff --git a/projects/watcom/ADLMIDI-linux32.tgt b/projects/watcom/ADLMIDI-linux32.tgt
index 98a1799..32c8bbc 100644
--- a/projects/watcom/ADLMIDI-linux32.tgt
+++ b/projects/watcom/ADLMIDI-linux32.tgt
@@ -79,7 +79,7 @@ WVList
 0

 20

 WPickList

-16

+14

 21

 MItem

 3

@@ -149,8 +149,8 @@ WVList
 0

 38

 MItem

-27

-..\..\src\adlmidi_mus2mid.c

+33

+..\..\src\chips\nuked\nukedopl3.c

 39

 WString

 4

@@ -167,8 +167,8 @@ WVList
 0

 42

 MItem

-27

-..\..\src\adlmidi_xmi2mid.c

+37

+..\..\src\chips\nuked\nukedopl3_174.c

 43

 WString

 4

@@ -185,8 +185,8 @@ WVList
 0

 46

 MItem

-33

-..\..\src\chips\nuked\nukedopl3.c

+26

+..\..\src\wopl\wopl_file.c

 47

 WString

 4

@@ -203,273 +203,237 @@ WVList
 0

 50

 MItem

-37

-..\..\src\chips\nuked\nukedopl3_174.c

-51

-WString

-4

-COBJ

-52

-WVList

-0

-53

-WVList

-0

-21

-1

-1

-0

-54

-MItem

-26

-..\..\src\wopl\wopl_file.c

-55

-WString

-4

-COBJ

-56

-WVList

-0

-57

-WVList

-0

-21

-1

-1

-0

-58

-MItem

 5

 *.cpp

-59

+51

 WString

 6

 CPPOBJ

-60

+52

 WVList

 4

-61

+53

 MVState

-62

+54

 WString

 3

 WPP

-63

+55

 WString

 25

 x????Include directories:

 1

-64

+56

 WString

 31

 "$(%watcom)/lh" "../../include"

 0

-65

+57

 MVState

-66

+58

 WString

 3

 WPP

-67

+59

 WString

 23

 ?????Macro definitions:

 1

-68

+60

 WString

 31

 ADLMIDI_DISABLE_DOSBOX_EMULATOR

 0

-69

+61

 MRState

-70

+62

 WString

 3

 WPP

-71

+63

 WString

 21

 ?????Default rounding

 1

 0

-72

+64

 MRState

-73

+65

 WString

 3

 WPP

-74

+66

 WString

 18

 ?????Omit rounding

 1

 1

-75

+67

 WVList

 0

 -1

 1

 1

 0

-76

+68

 MItem

 21

 ..\..\src\adldata.cpp

-77

+69

 WString

 6

 CPPOBJ

-78

+70

 WVList

 0

-79

+71

 WVList

 0

-58

+50

 1

 1

 0

-80

+72

 MItem

 21

 ..\..\src\adlmidi.cpp

-81

+73

 WString

 6

 CPPOBJ

-82

+74

 WVList

 0

-83

+75

 WVList

 0

-58

+50

 1

 1

 0

-84

+76

 MItem

 26

 ..\..\src\adlmidi_load.cpp

-85

+77

 WString

 6

 CPPOBJ

-86

+78

 WVList

 0

-87

+79

 WVList

 0

-58

+50

 1

 1

 0

-88

+80

 MItem

 30

 ..\..\src\adlmidi_midiplay.cpp

-89

+81

 WString

 6

 CPPOBJ

-90

+82

 WVList

 0

-91

+83

 WVList

 0

-58

+50

 1

 1

 0

-92

+84

 MItem

 26

 ..\..\src\adlmidi_opl3.cpp

-93

+85

 WString

 6

 CPPOBJ

-94

+86

 WVList

 0

-95

+87

 WVList

 0

-58

+50

 1

 1

 0

-96

+88

 MItem

 29

 ..\..\src\adlmidi_private.cpp

-97

+89

 WString

 6

 CPPOBJ

-98

+90

 WVList

 0

-99

+91

 WVList

 0

-58

+50

 1

 1

 0

-100

+92

 MItem

-30

-..\..\src\chips\nuked_opl3.cpp

-101

+31

+..\..\src\adlmidi_sequencer.cpp

+93

 WString

 6

 CPPOBJ

-102

+94

 WVList

 0

-103

+95

 WVList

 0

-58

+50

 1

 1

 0

-104

+96

 MItem

-35

-..\..\src\chips\nuked_opl3_v174.cpp

-105

+30

+..\..\src\chips\nuked_opl3.cpp

+97

 WString

 6

 CPPOBJ

-106

+98

 WVList

 0

-107

+99

 WVList

 0

-58

+50

 1

 1

 0

-108

+100

 MItem

-33

-..\..\src\chips\opl_chip_base.cpp

-109

+35

+..\..\src\chips\nuked_opl3_v174.cpp

+101

 WString

 6

 CPPOBJ

-110

+102

 WVList

 0

-111

+103

 WVList

 0

-58

+50

 1

 1

 0

diff --git a/projects/watcom/ADLMIDI-win32.tgt b/projects/watcom/ADLMIDI-win32.tgt
index 379bf30..c6dac83 100644
--- a/projects/watcom/ADLMIDI-win32.tgt
+++ b/projects/watcom/ADLMIDI-win32.tgt
@@ -7,12 +7,12 @@ MComponent
 0

 2

 WString

-4

-NDLL

+3

+LIB

 3

 WString

 5

-n_2dn

+n_2sn

 1

 0

 1

@@ -25,11 +25,11 @@ MCommand
 6

 MItem

 17

-ADLMIDI-win32.dll

+ADLMIDI-win32.lib

 7

 WString

-4

-NDLL

+3

+LIB

 8

 WVList

 2

@@ -79,7 +79,7 @@ WVList
 0

 20

 WPickList

-16

+14

 21

 MItem

 3

@@ -149,8 +149,8 @@ WVList
 0

 38

 MItem

-27

-..\..\src\adlmidi_mus2mid.c

+33

+..\..\src\chips\nuked\nukedopl3.c

 39

 WString

 4

@@ -167,8 +167,8 @@ WVList
 0

 42

 MItem

-27

-..\..\src\adlmidi_xmi2mid.c

+37

+..\..\src\chips\nuked\nukedopl3_174.c

 43

 WString

 4

@@ -185,8 +185,8 @@ WVList
 0

 46

 MItem

-33

-..\..\src\chips\nuked\nukedopl3.c

+26

+..\..\src\wopl\wopl_file.c

 47

 WString

 4

@@ -203,273 +203,237 @@ WVList
 0

 50

 MItem

-37

-..\..\src\chips\nuked\nukedopl3_174.c

-51

-WString

-4

-COBJ

-52

-WVList

-0

-53

-WVList

-0

-21

-1

-1

-0

-54

-MItem

-26

-..\..\src\wopl\wopl_file.c

-55

-WString

-4

-COBJ

-56

-WVList

-0

-57

-WVList

-0

-21

-1

-1

-0

-58

-MItem

 5

 *.cpp

-59

+51

 WString

 6

 CPPOBJ

-60

+52

 WVList

 4

-61

+53

 MVState

-62

+54

 WString

 3

 WPP

-63

+55

 WString

 25

 n????Include directories:

 1

-64

+56

 WString

 47

 "$(%watcom)/h;$(%watcom)/h/nt"  "../../include"

 0

-65

+57

 MVState

-66

+58

 WString

 3

 WPP

-67

+59

 WString

 23

 ?????Macro definitions:

 1

-68

+60

 WString

 31

 ADLMIDI_DISABLE_DOSBOX_EMULATOR

 0

-69

+61

 MRState

-70

+62

 WString

 3

 WPP

-71

+63

 WString

 21

 ?????Default rounding

 1

 0

-72

+64

 MRState

-73

+65

 WString

 3

 WPP

-74

+66

 WString

 18

 ?????Omit rounding

 1

 1

-75

+67

 WVList

 0

 -1

 1

 1

 0

-76

+68

 MItem

 21

 ..\..\src\adldata.cpp

-77

+69

 WString

 6

 CPPOBJ

-78

+70

 WVList

 0

-79

+71

 WVList

 0

-58

+50

 1

 1

 0

-80

+72

 MItem

 21

 ..\..\src\adlmidi.cpp

-81

+73

 WString

 6

 CPPOBJ

-82

+74

 WVList

 0

-83

+75

 WVList

 0

-58

+50

 1

 1

 0

-84

+76

 MItem

 26

 ..\..\src\adlmidi_load.cpp

-85

+77

 WString

 6

 CPPOBJ

-86

+78

 WVList

 0

-87

+79

 WVList

 0

-58

+50

 1

 1

 0

-88

+80

 MItem

 30

 ..\..\src\adlmidi_midiplay.cpp

-89

+81

 WString

 6

 CPPOBJ

-90

+82

 WVList

 0

-91

+83

 WVList

 0

-58

+50

 1

 1

 0

-92

+84

 MItem

 26

 ..\..\src\adlmidi_opl3.cpp

-93

+85

 WString

 6

 CPPOBJ

-94

+86

 WVList

 0

-95

+87

 WVList

 0

-58

+50

 1

 1

 0

-96

+88

 MItem

 29

 ..\..\src\adlmidi_private.cpp

-97

+89

 WString

 6

 CPPOBJ

-98

+90

 WVList

 0

-99

+91

 WVList

 0

-58

+50

 1

 1

 0

-100

+92

 MItem

-30

-..\..\src\chips\nuked_opl3.cpp

-101

+31

+..\..\src\adlmidi_sequencer.cpp

+93

 WString

 6

 CPPOBJ

-102

+94

 WVList

 0

-103

+95

 WVList

 0

-58

+50

 1

 1

 0

-104

+96

 MItem

-35

-..\..\src\chips\nuked_opl3_v174.cpp

-105

+30

+..\..\src\chips\nuked_opl3.cpp

+97

 WString

 6

 CPPOBJ

-106

+98

 WVList

 0

-107

+99

 WVList

 0

-58

+50

 1

 1

 0

-108

+100

 MItem

-33

-..\..\src\chips\opl_chip_base.cpp

-109

+35

+..\..\src\chips\nuked_opl3_v174.cpp

+101

 WString

 6

 CPPOBJ

-110

+102

 WVList

 0

-111

+103

 WVList

 0

-58

+50

 1

 1

 0

diff --git a/projects/watcom/ADLMIDI.tgt b/projects/watcom/ADLMIDI.tgt
index 5e8def9..7163aeb 100644
--- a/projects/watcom/ADLMIDI.tgt
+++ b/projects/watcom/ADLMIDI.tgt
@@ -79,7 +79,7 @@ WVList
 0

 20

 WPickList

-16

+14

 21

 MItem

 3

@@ -149,8 +149,8 @@ WVList
 0

 38

 MItem

-27

-..\..\src\adlmidi_mus2mid.c

+33

+..\..\src\chips\nuked\nukedopl3.c

 39

 WString

 4

@@ -167,8 +167,8 @@ WVList
 0

 42

 MItem

-27

-..\..\src\adlmidi_xmi2mid.c

+37

+..\..\src\chips\nuked\nukedopl3_174.c

 43

 WString

 4

@@ -185,8 +185,8 @@ WVList
 0

 46

 MItem

-33

-..\..\src\chips\nuked\nukedopl3.c

+26

+..\..\src\wopl\wopl_file.c

 47

 WString

 4

@@ -203,273 +203,237 @@ WVList
 0

 50

 MItem

-37

-..\..\src\chips\nuked\nukedopl3_174.c

-51

-WString

-4

-COBJ

-52

-WVList

-0

-53

-WVList

-0

-21

-1

-1

-0

-54

-MItem

-26

-..\..\src\wopl\wopl_file.c

-55

-WString

-4

-COBJ

-56

-WVList

-0

-57

-WVList

-0

-21

-1

-1

-0

-58

-MItem

 5

 *.cpp

-59

+51

 WString

 6

 CPPOBJ

-60

+52

 WVList

 4

-61

+53

 MVState

-62

+54

 WString

 3

 WPP

-63

+55

 WString

 25

 d????Include directories:

 1

-64

+56

 WString

 30

 "$(%watcom)/h" "../../include"

 0

-65

+57

 MVState

-66

+58

 WString

 3

 WPP

-67

+59

 WString

 23

 ?????Macro definitions:

 1

-68

+60

 WString

 31

 ADLMIDI_DISABLE_DOSBOX_EMULATOR

 0

-69

+61

 MRState

-70

+62

 WString

 3

 WPP

-71

+63

 WString

 21

 ?????Default rounding

 1

 0

-72

+64

 MRState

-73

+65

 WString

 3

 WPP

-74

+66

 WString

 18

 ?????Omit rounding

 1

 1

-75

+67

 WVList

 0

 -1

 1

 1

 0

-76

+68

 MItem

 21

 ..\..\src\adldata.cpp

-77

+69

 WString

 6

 CPPOBJ

-78

+70

 WVList

 0

-79

+71

 WVList

 0

-58

+50

 1

 1

 0

-80

+72

 MItem

 21

 ..\..\src\adlmidi.cpp

-81

+73

 WString

 6

 CPPOBJ

-82

+74

 WVList

 0

-83

+75

 WVList

 0

-58

+50

 1

 1

 0

-84

+76

 MItem

 26

 ..\..\src\adlmidi_load.cpp

-85

+77

 WString

 6

 CPPOBJ

-86

+78

 WVList

 0

-87

+79

 WVList

 0

-58

+50

 1

 1

 0

-88

+80

 MItem

 30

 ..\..\src\adlmidi_midiplay.cpp

-89

+81

 WString

 6

 CPPOBJ

-90

+82

 WVList

 0

-91

+83

 WVList

 0

-58

+50

 1

 1

 0

-92

+84

 MItem

 26

 ..\..\src\adlmidi_opl3.cpp

-93

+85

 WString

 6

 CPPOBJ

-94

+86

 WVList

 0

-95

+87

 WVList

 0

-58

+50

 1

 1

 0

-96

+88

 MItem

 29

 ..\..\src\adlmidi_private.cpp

-97

+89

 WString

 6

 CPPOBJ

-98

+90

 WVList

 0

-99

+91

 WVList

 0

-58

+50

 1

 1

 0

-100

+92

 MItem

-30

-..\..\src\chips\nuked_opl3.cpp

-101

+31

+..\..\src\adlmidi_sequencer.cpp

+93

 WString

 6

 CPPOBJ

-102

+94

 WVList

 0

-103

+95

 WVList

 0

-58

+50

 1

 1

 0

-104

+96

 MItem

-35

-..\..\src\chips\nuked_opl3_v174.cpp

-105

+30

+..\..\src\chips\nuked_opl3.cpp

+97

 WString

 6

 CPPOBJ

-106

+98

 WVList

 0

-107

+99

 WVList

 0

-58

+50

 1

 1

 0

-108

+100

 MItem

-33

-..\..\src\chips\opl_chip_base.cpp

-109

+35

+..\..\src\chips\nuked_opl3_v174.cpp

+101

 WString

 6

 CPPOBJ

-110

+102

 WVList

 0

-111

+103

 WVList

 0

-58

+50

 1

 1

 0

diff --git a/projects/watcom/libADLMIDI-linux32.wpj b/projects/watcom/libADLMIDI-linux32.wpj
index e3262c6..b75df3d 100644
--- a/projects/watcom/libADLMIDI-linux32.wpj
+++ b/projects/watcom/libADLMIDI-linux32.wpj
@@ -32,8 +32,8 @@ WVList
 VComponent

 9

 WRect

-232

-380

+224

+370

 5712

 4360

 0

@@ -43,13 +43,13 @@ WFileName
 19

 ADLMIDI-linux32.tgt

 0

-15

+9

 11

 VComponent

 12

 WRect

-3896

-1440

+3960

+1880

 5712

 4360

 0

@@ -60,4 +60,4 @@ WFileName
 playmidi-linux32.tgt

 0

 3

-11

+8

diff --git a/projects/watcom/libADLMIDI-win32.wpj b/projects/watcom/libADLMIDI-win32.wpj
index 9a7684d..f53e2d3 100644
--- a/projects/watcom/libADLMIDI-win32.wpj
+++ b/projects/watcom/libADLMIDI-win32.wpj
@@ -32,8 +32,8 @@ WVList
 VComponent

 9

 WRect

-560

-450

+360

+380

 5712

 4360

 0

@@ -43,7 +43,7 @@ WFileName
 17

 ADLMIDI-win32.tgt

 0

-15

+13

 11

 VComponent

 12

@@ -60,4 +60,4 @@ WFileName
 playmidi-win32.tgt

 0

 3

-11

+8

diff --git a/projects/watcom/libADLMIDI.wpj b/projects/watcom/libADLMIDI.wpj
index 7bdefd1..f64caeb 100644
--- a/projects/watcom/libADLMIDI.wpj
+++ b/projects/watcom/libADLMIDI.wpj
@@ -32,8 +32,8 @@ WVList
 VComponent

 9

 WRect

-328

-240

+360

+590

 5712

 4360

 0

@@ -43,13 +43,13 @@ WFileName
 11

 ADLMIDI.tgt

 0

-10

+13

 11

 VComponent

 12

 WRect

-3760

-680

+4168

+2980

 5712

 4360

 0