Skip to content

Commit

Permalink
Switch to open-watcom-v2; create ldcvt test from ow source
Browse files Browse the repository at this point in the history
  • Loading branch information
caiiiycuk committed Dec 15, 2023
1 parent 9953f72 commit 5754fd9
Show file tree
Hide file tree
Showing 6 changed files with 1,428 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: install openwatcom-1.9
run: curl "https://cdn.dos.zone/custom/openwatcom.zip" -o openwatcom.zip && mkdir -p $HOME/sdk && unzip openwatcom.zip -d $HOME/sdk/openwatcom
run: curl "https://cdn.dos.zone/custom/ow2.zip" -o ow2.zip && mkdir -p $HOME/sdk && unzip ow2.zip -d $HOME/sdk/ow2
- name: build.sh
run: cd bin && ./build.sh
- uses: actions/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@

bin/*.o
bin/*.exe
bin/*.err
bin/*.err
bin/*.map
12 changes: 4 additions & 8 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@

set -ex

export WATCOM="$HOME/sdk/openwatcom"
export PATH="$PATH:$WATCOM/binl"
export LIB="$LIB:$WATCOM/lib386:$WATCOM/lib386/dos"


rm -f *.o dhry_2.exe
source "$WATCOM/owsetenv.sh"
wcl386 -bt=dos -ldos4g -otexan -zp8 -5r -ms -DCOD -I"$WATCOM/h" ../dhry2/dhry_2.c ../dhry2/dhry_1.c
rm -f *.o *.exe *.err
source ~/sdk/ow2/owsetenv.sh
DOS_INCLUDE=$WATCOM/h wcl386 -bt=dos -ldos4g -otexan -zp8 -5r -fm -ms -wx ../dhry2/dhry_2.c ../dhry2/dhry_1.c
DOS_INCLUDE=$WATCOM/h wcl -bt=dos -ldos -otexan -fm -ms -wx ../ldcvt/ldcvt.c
rm -f *.o
5 changes: 2 additions & 3 deletions dhry2/dhry_1.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ int Int_Glob;
printf ("With run time input data\n\n");
}

printf ("Compiler %s\n", compiler);
printf ("Optimisation %s\n", options);
printf ("Compiler %s\n", "open-watcom-v2");
printf ("Optimisation %s\n", "-otexan -zp8 -5r");
#ifdef ROPT
printf ("Register option selected\n\n");
#else
Expand Down Expand Up @@ -599,7 +599,6 @@ void Proc_4 () /* without parameters */
#ifdef NOSTRUCTASSIGN
memcpy (d, s, l)
register char *d;
register char *s;
register int l;
{
while (l--) *d++ = *s++;
Expand Down
Loading

0 comments on commit 5754fd9

Please sign in to comment.