haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2026-02-04 07:53:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

jam: Fix build/run on Windows.

Browse Source 
Only works when compiled in 32-bit mode, as there's a whole bunch
of pointer arithmetic that depends on "int" being 32bit, not 64bit.
This commit is contained in:
Augustin Cavalier
2015-07-23 16:42:47 -04:00
parent 52fa22bd84
commit 148cc99040
4 changed files with 130 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jam/Jambase
View File

@@ -197,12 +197,9 @@ if $(NT)
CCFLAGS ?= /D \"WIN\" ;
C++ ?= $(CC) ;
C++FLAGS ?= $(CCFLAGS) ;
LINK ?= $(CC) ;
LINKFLAGS ?= $(CCFLAGS) ;
LINKLIBS ?=
$(MSVC)\\lib\\mlibce.lib
$(MSVC)\\lib\\oldnames.lib
;
LINK ?= link /nologo ;
LINKFLAGS ?= ;
LINKLIBS ?= ;
LINKLIBS ?= ;
NOARSCAN ?= true ;
OPTIM ?= ;
@@ -229,7 +226,6 @@ if $(NT)
LINKFLAGS ?= "" ;
LINKLIBS ?=
$(MSVCNT)\\lib\\$(I)libc.lib
$(MSVCNT)\\lib\\$(I)oldnames.lib
$(MSVCNT)\\lib\\$(I)kernel32.lib ;
OPTIM ?= "" ;
STDHDRS ?= $(MSVCNT)\\include ;
@@ -2012,7 +2008,7 @@ else if $(NT) && $(MSVC)
{
actions updated together piecemeal Archive
{
$(AR) $(<) -+$(>)
$(AR) $(<) $(>)
}
actions Cc

3
jam/Makefile
View File

@@ -29,7 +29,7 @@ HOST_SYSTEM=$(shell uname)
# NT (with Microsoft compiler)
# People with DevStudio settings already in shell environment.
#CC = cl /nologo
#CFLAGS = -DNT
#CFLAGS = -DNT -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN
#TARGET = /Fejam0
#EXENAME = .\jam0.exe
@@ -67,7 +67,6 @@ SOURCES = \
rules.c scan.c search.c timestamp.c variable.c
all: $(EXENAME)
LINKLIBS=$(LINKLIBS) $(EXENAME)
$(EXENAME):
$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)

1
jam/jam.h
View File

@@ -94,6 +94,7 @@
# define OS_NT
# define SPLITPATH ';'
# define MAXLINE 996 /* longest 'together' actions */
# define PATH_MAX _MAX_PATH
# define USE_EXECUNIX
# define USE_PATHUNIX
# define PATH_DELIM '\\'

14
jam/jambase.c
View File

@@ -32,12 +32,9 @@ const char *jambase[] = {
"CCFLAGS ?= /D \\\"WIN\\\" ;\n",
"C++ ?= $(CC) ;\n",
"C++FLAGS ?= $(CCFLAGS) ;\n",
"LINK ?= $(CC) ;\n",
"LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= \n",
"$(MSVC)\\\\lib\\\\mlibce.lib\n",
"$(MSVC)\\\\lib\\\\oldnames.lib\n",
";\n",
"LINK ?= link /nologo ;\n",
"LINKFLAGS ?= ;\n",
"LINKLIBS ?= ;\n",
"LINKLIBS ?= ;\n",
"NOARSCAN ?= true ;\n",
"OPTIM ?= ;\n",
@@ -58,7 +55,6 @@ const char *jambase[] = {
"LINKFLAGS ?= \"\" ;\n",
"LINKLIBS ?=\n",
"$(MSVCNT)\\\\lib\\\\$(I)libc.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)oldnames.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)kernel32.lib ;\n",
"OPTIM ?= \"\" ;\n",
"STDHDRS ?= $(MSVCNT)\\\\include ;\n",
@@ -334,7 +330,7 @@ const char *jambase[] = {
"LEX ?= lex ;\n",
"LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= ;\n",
"OPTIM ?= -O ;\n",
"OPTIM ?= ;\n",
"RANLIB ?= ranlib ;\n",
"YACC ?= yacc ;\n",
"YACCGEN ?= .c ;\n",
@@ -1186,7 +1182,7 @@ const char *jambase[] = {
"{\n",
"actions updated together piecemeal Archive\n",
"{\n",
"$(AR) $(<) -+$(>)\n",
"$(AR) $(<) $(>)\n",
"}\n",
"actions Cc\n",
"{\n",