folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed makefile to not always include network components when compiling with MinGW and added ability to pass arbitrary arguments when invoking gcc with the batch files

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-15 09:40:30 -08:00
parent 60a0881c71
commit 06b80cf53c
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_mingw.bat
View file

@ -17,4 +17,4 @@ if ERRORLEVEL 1 path C:\MinGW\bin;%path%
if not exist BIN mkdir BIN if not exist BIN mkdir BIN
gcc -v 1>NUL 2>NUL gcc -v 1>NUL 2>NUL
if ERRORLEVEL 1 echo "MinGW Environment Unavailable" if ERRORLEVEL 1 echo "MinGW Environment Unavailable"
mingw32-make WIN32=1 -f makefile %1 %2 %3 %4 mingw32-make WIN32=1 -f makefile %*

2
build_mingw_ether.bat
View file

@ -13,4 +13,4 @@ if ERRORLEVEL 1 path C:\MinGW\bin;%path%
if not exist BIN mkdir BIN if not exist BIN mkdir BIN
gcc -v 1>NUL 2>NUL gcc -v 1>NUL 2>NUL
if ERRORLEVEL 1 echo "MinGW Environment Unavailable" if ERRORLEVEL 1 echo "MinGW Environment Unavailable"
mingw32-make WIN32=1 USE_NETWORK=1 -f makefile %1 %2 %3 %4 mingw32-make WIN32=1 USE_NETWORK=1 -f makefile %*

2
build_mingw_noasync.bat
View file

@ -12,4 +12,4 @@ if ERRORLEVEL 1 path C:\MinGW\bin;%path%
if not exist BIN mkdir BIN if not exist BIN mkdir BIN
gcc -v 1>NUL 2>NUL gcc -v 1>NUL 2>NUL
if ERRORLEVEL 1 echo "MinGW Environment Unavailable" if ERRORLEVEL 1 echo "MinGW Environment Unavailable"
mingw32-make WIN32=1 NOASYNCH=1 -f makefile %1 %2 %3 %4 mingw32-make WIN32=1 NOASYNCH=1 -f makefile %*

11
makefile
View file

@ -293,19 +293,17 @@ else
endif endif
endif endif
ifeq (pcap,$(shell if exist ..\windows-build\winpcap\Wpdpack\include\pcap.h echo pcap)) ifeq (pcap,$(shell if exist ..\windows-build\winpcap\Wpdpack\include\pcap.h echo pcap))
PCAP_CCDEFS = -I../windows-build/winpcap/Wpdpack/include -I$(GCC_Path)..\include\ddk -DUSE_SHARED
NETWORK_LDFLAGS = NETWORK_LDFLAGS =
NETWORK_OPT = -DUSE_SHARED NETWORK_OPT = -DUSE_SHARED -I../windows-build/winpcap/Wpdpack/include -I$(GCC_Path)..\include\ddk
NETWORK_FEATURES = - dynamic networking support using windows-build provided libpcap components NETWORK_FEATURES = - dynamic networking support using windows-build provided libpcap components
else else
ifeq (pcap,$(shell if exist $(dir $(GCC_Path))..\include\pcap.h echo pcap)) ifeq (pcap,$(shell if exist $(dir $(GCC_Path))..\include\pcap.h echo pcap))
PCAP_CCDEFS = -DUSE_SHARED -I$(GCC_Path)..\include\ddk
NETWORK_LDFLAGS = NETWORK_LDFLAGS =
NETWORK_OPT = -DUSE_SHARED NETWORK_OPT = -DUSE_SHARED -I$(GCC_Path)..\include\ddk
NETWORK_FEATURES = - dynamic networking support using libpcap components found in the MinGW directories NETWORK_FEATURES = - dynamic networking support using libpcap components found in the MinGW directories
endif endif
endif endif
OS_CCDEFS = -fms-extensions $(PTHREADS_CCDEFS) $(PCAP_CCDEFS) OS_CCDEFS = -fms-extensions $(PTHREADS_CCDEFS)
OS_LDFLAGS = -lm -lwsock32 -lwinmm $(PTHREADS_LDFLAGS) OS_LDFLAGS = -lm -lwsock32 -lwinmm $(PTHREADS_LDFLAGS)
EXE = .exe EXE = .exe
ifneq (binexists,$(shell if exist BIN echo binexists)) ifneq (binexists,$(shell if exist BIN echo binexists))
@ -454,7 +452,8 @@ PDP11 = ${PDP11D}/pdp11_fp.c ${PDP11D}/pdp11_cpu.c ${PDP11D}/pdp11_dz.c \
${PDP11D}/pdp11_rh.c ${PDP11D}/pdp11_tu.c ${PDP11D}/pdp11_cpumod.c \ ${PDP11D}/pdp11_rh.c ${PDP11D}/pdp11_tu.c ${PDP11D}/pdp11_cpumod.c \
${PDP11D}/pdp11_cr.c ${PDP11D}/pdp11_rf.c ${PDP11D}/pdp11_dl.c \ ${PDP11D}/pdp11_cr.c ${PDP11D}/pdp11_rf.c ${PDP11D}/pdp11_dl.c \
${PDP11D}/pdp11_ta.c ${PDP11D}/pdp11_rc.c ${PDP11D}/pdp11_kg.c \ ${PDP11D}/pdp11_ta.c ${PDP11D}/pdp11_rc.c ${PDP11D}/pdp11_kg.c \
${PDP11D}/pdp11_ke.c ${PDP11D}/pdp11_dc.c ${PDP11D}/pdp11_io_lib.c ${PDP11D}/pdp11_ke.c ${PDP11D}/pdp11_dc.c ${PDP11D}/pdp11_dmc.c \
${PDP11D}/pdp11_io_lib.c
PDP11_OPT = -DVM_PDP11 -I ${PDP11D} ${NETWORK_OPT} PDP11_OPT = -DVM_PDP11 -I ${PDP11D} ${NETWORK_OPT}