Skip to content

Commit

Permalink
Solved some 32-bit compilation problems.
Browse files Browse the repository at this point in the history
  • Loading branch information
marchaesen committed May 18, 2024
1 parent 9b37f5e commit e1e4444
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion libXt/src/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ CSRCS = \
Vendor.c \
StringDefs.c

load_makefile IS64=1 NORELDBG=1 makefile.srcs
load_makefile NORELDBG=1 makefile.srcs

5 changes: 1 addition & 4 deletions libXt/src/makefile.srcs
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

4 changes: 4 additions & 0 deletions setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1e4444

Please sign in to comment.