diff --git a/libXt/src/makefile b/libXt/src/makefile index 238c3c5bfb..28d3722d02 100644 --- a/libXt/src/makefile +++ b/libXt/src/makefile @@ -60,5 +60,5 @@ CSRCS = \ Vendor.c \ StringDefs.c -load_makefile IS64=1 NORELDBG=1 makefile.srcs +load_makefile NORELDBG=1 makefile.srcs diff --git a/libXt/src/makefile.srcs b/libXt/src/makefile.srcs index 218329cd27..f281753c58 100644 --- a/libXt/src/makefile.srcs +++ b/libXt/src/makefile.srcs @@ -1,9 +1,6 @@ ifneq ($(NORELDBG),1) $(error NORELDBG should have been set to 1) endif -ifneq ($(IS64),1) -$(error IS64 should have been set to 1, buld is independent on 32-bit) -endif BUILT_SOURCE = StringDefs.c BUILT_HEADER = ../include/X11/StringDefs.h ../include/X11/Shell.h @@ -20,5 +17,5 @@ $(BUILT_SOURCE) $(BUILT_HEADER) : ../util/$(OBJDIR)/makestrs.exe $(STRING_LIST) move Shell.h ..$/include$/X11 touch ..$/include$/X11$/Shell.h -load_makefile ../util/makefile MAKESERVER=0 NORELDBG=1 IS64=1 +load_makefile ../util/makefile MAKESERVER=0 NORELDBG=1 diff --git a/setenv.sh b/setenv.sh index 50575dd979..b8442f78a3 100755 --- a/setenv.sh +++ b/setenv.sh @@ -6,7 +6,11 @@ rm -f commands.sh python setenv.py $1 > commands.sh chmod +x commands.sh source commands.sh +if [[ "$1" == "1" ]] ; then export PATH=/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:$DIR/tools/mhmake/Release64:/mnt/c/nasm:$PATH:/mnt/c/gnuwin32/bin:/mnt/c/perl/perl/bin +else +export PATH=/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:$DIR/tools/mhmake/Release:/mnt/c/nasm:$PATH:/mnt/c/gnuwin32/bin:/mnt/c/perl/perl/bin +fi rm -f commands.sh export MHMAKECONF=$DIR export PYTHON3=/mnt/c/Python39/python.exe