Skip to content

Commit

Permalink
Update _wcc and makefiles.
Browse files Browse the repository at this point in the history
  • Loading branch information
@valerius2k
valerius2k committed Jan 2, 2023
1 parent 372ee93 commit d8b9950
Show file tree
Hide file tree
Showing 51 changed files with 221 additions and 101 deletions.
12 changes: 9 additions & 3 deletions _wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions _wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
12 changes: 9 additions & 3 deletions commdlg/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions commdlg/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
12 changes: 9 additions & 3 deletions dosx/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions dosx/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
12 changes: 9 additions & 3 deletions dosx/hdpmi/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions dosx/hdpmi/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion dosx/hdpmi/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ JWASM = 1
ADD_ASMOPT = -D?32BIT=0 -c -Cp -Sg
DEST = os2$(SEP)mdos$(SEP)winos2

!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk
2 changes: 1 addition & 1 deletion dosx/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ DIRS = hdpmi

DIRS = hdpmi

!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk
12 changes: 9 additions & 3 deletions kernel/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions kernel/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
12 changes: 9 additions & 3 deletions kernel/kernel/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions kernel/kernel/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion kernel/kernel/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ADD_ASMOPT = -D?32BIT=0 -D?DEBUG=0 -D?REAL=1
JWASM = 1
DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system

!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk

.asm: $(MYDIR)..

Expand Down
1 change: 1 addition & 0 deletions kernel/kernel16.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,7 @@ ENTRY ends

_DATA segment

<<<<<<< Updated upstream
KernelNE NEHDR <"EN", 1, KernelEntries - KernelNE, 0, 0, NEHDR.szModPath - 8, 0, AF_DLL or AF_INIT>
db 79 dup (0)

Expand Down
12 changes: 9 additions & 3 deletions kernel/krnl286/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions kernel/krnl286/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion kernel/krnl286/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ADD_ASMOPT = -D?32BIT=0 -D?DEBUG=0 -D?REAL=0
JWASM = 1
DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system

!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk

.asm: $(MYDIR)..

Expand Down
12 changes: 9 additions & 3 deletions kernel/krnl386/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions kernel/krnl386/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion kernel/krnl386/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ JWASM = 1
DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system


!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk

.asm: $(MYDIR)..

Expand Down
2 changes: 1 addition & 1 deletion kernel/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

DIRS = kernel krnl286 krnl386

!include $(%ROOT)/mk/all.mk
!include $(%ROOT)tools/mk/all.mk
12 changes: 9 additions & 3 deletions logo/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions logo/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion logo/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NOLIBS = 1
INSTALL_ADD = 1
DEST = os2$(SEP)mdos$(SEP)winos2

!include $(%ROOT)/mk/appsdos.mk
!include $(%ROOT)tools/mk/appsdos.mk

.SUFFIXES: .lgo .com

Expand Down
12 changes: 9 additions & 3 deletions lzexpand/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions lzexpand/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion lzexpand/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ EXPORTS = LZCOPY .1, &
OPTIONS = heapsize=32K libfile libentry.obj
DEST = os2$(SEP)mdos$(SEP)winos2$(SEP)system

!include $(%ROOT)/mk/appsw16.mk
!include $(%ROOT)tools/mk/appsw16.mk
2 changes: 1 addition & 1 deletion makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

DIRS = logo win dosx kernel samples programs lzexpand

!include $(%ROOT)/mk/all.mk
!include $(%ROOT)tools/mk/all.mk

12 changes: 9 additions & 3 deletions programs/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions programs/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion programs/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

DIRS = progman winver

!include $(%ROOT)/mk/all.mk
!include $(%ROOT)tools/mk/all.mk

#TARGETS=subdirs
#TARGET=all
12 changes: 9 additions & 3 deletions programs/progman/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions programs/progman/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
2 changes: 1 addition & 1 deletion programs/progman/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ IMPORTS = GETOPENFILENAME COMMDLG.1, &
#RESOURCE = $(PATH)rsrc.res
CLEAN_ADD = *.mbr

!include $(%ROOT)/mk/appsw16.mk
!include $(%ROOT)tools/mk/appsw16.mk

TARGETS = $(PATH)$(PROJ1).exe # subdirs

Expand Down
12 changes: 9 additions & 3 deletions programs/winefile/_wcc.cmd
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
set root=..\..\..\..
set path=%root%\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
set root=.
:loop
if exist "%root%\tools\mk\all.mk" goto found
set root=%root%\..
goto loop
:found
set path=%root%\tools\conf\scripts;%path%
call build %1 %2 %3 %4 %5 %6 %7 %8 %9
5 changes: 3 additions & 2 deletions programs/winefile/_wcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#! /bin/sh
#

export ROOT=../../../..
export PATH=$ROOT/conf/scripts:$PATH
export ROOT=.
while [ ! -f "$ROOT/tools/mk/all.mk" ]; do ROOT="$ROOT/.."; done
export PATH=$ROOT/tools/conf/scripts:$PATH
build-lnx.sh $*
Loading

0 comments on commit d8b9950

Please sign in to comment.