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

makefile: Added build support for simulators which use the display library on host platforms which have X11 support not located in /usr/include.

Browse source 
Simulators affected: pdp1, pdp11 and tx-0
Host platforms which now build with display support: OS X
This commit is contained in:
Mark Pizzolato 2014-10-29 10:43:48 -07:00
parent ff4961411f
commit 4456e42b08
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
makefile
View file

@ -66,14 +66,21 @@ ifneq (,$(or $(findstring pdp11,$(MAKECMDGOALS)),$(findstring vax,$(MAKECMDGOALS
ifneq (,$(findstring all,$(MAKECMDGOALS))$(word 2,$(MAKECMDGOALS))) ifneq (,$(findstring all,$(MAKECMDGOALS))$(word 2,$(MAKECMDGOALS)))
BUILD_MULTIPLE = s BUILD_MULTIPLE = s
VIDEO_USEFUL = true VIDEO_USEFUL = true
DISPLAY_USEFUL = true
endif endif
else else
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
# default target is all # default target is all
NETWORK_USEFUL = true NETWORK_USEFUL = true
VIDEO_USEFUL = true VIDEO_USEFUL = true
DISPLAY_USEFUL = true
BUILD_MULTIPLE = s BUILD_MULTIPLE = s
BUILD_SINGLE := all $(BUILD_SINGLE) BUILD_SINGLE := all $(BUILD_SINGLE)
else
ifneq (,$(or $(or $(findstring pdp1,$(MAKECMDGOALS)),$(findstring pdp11,$(MAKECMDGOALS))),$(findstring tx-0,$(MAKECMDGOALS))))
DISPLAY_USEFUL = true
$(info DISPLAY USEFUL SET)
endif
endif endif
endif endif
ifeq ($(WIN32),) #*nix Environments (&& cygwin) ifeq ($(WIN32),) #*nix Environments (&& cygwin)
@ -395,6 +402,27 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
$(info *** Info ***) $(info *** Info ***)
endif endif
endif endif
ifneq (,$(DISPLAY_USEFUL))
ifeq (,$(WIN32))
ifneq (,$(call find_include,X11/Intrinsic))
ifneq (,$(call find_lib,Xt))
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/x11.c
DISPLAYVT = ${DISPLAYD}/vt11.c
DISPLAY_OPT += -DUSE_DISPLAY -I$(dir $(call find_include,X11/Intrinsic))/include -lXt -lX11 -lm
$(info using display: $(call find_lib,Xt) $(call find_include,X11/Intrinsic))
endif
ifneq (,$(GCC_WARNINGS_CMD)$(CLANG_VERSION))
ifneq (,$(CLANG_VERSION)$(findstring -Wdeprecated-declarations,$(shell $(GCC_WARNINGS_CMD))))
DISPLAY_OPT += -Wno-deprecated-declarations
endif
endif
endif
else
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/win32.c
DISPLAYVT = ${DISPLAYD}/vt11.c
DISPLAY_OPT = -DUSE_DISPLAY -lgdi32
endif
endif
ifneq (,$(NETWORK_USEFUL)) ifneq (,$(NETWORK_USEFUL))
ifneq (,$(call find_include,pcap)) ifneq (,$(call find_include,pcap))
ifneq (,$(shell grep 'pcap/pcap.h' $(call find_include,pcap) | grep include)) ifneq (,$(shell grep 'pcap/pcap.h' $(call find_include,pcap) | grep include))
@ -799,26 +827,6 @@ SIM = scp.c sim_console.c sim_fio.c sim_timer.c sim_sock.c \
sim_video.c sim_imd.c sim_video.c sim_imd.c
DISPLAYD = display DISPLAYD = display
ifeq ($(WIN32),)
ifeq (x11,$(shell if $(TEST) -e /usr/include/X11/Intrinsic.h ; then echo x11; fi))
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/x11.c
DISPLAYVT = ${DISPLAYD}/vt11.c
DISPLAY_OPT = -DUSE_DISPLAY -I/usr/X11/include -lXt -lX11 -lm
ifneq (,$(GCC_WARNINGS_CMD)$(CLANG_VERSION))
ifneq (,$(CLANG_VERSION)$(findstring -Wdeprecated-declarations,$(shell $(GCC_WARNINGS_CMD))))
DISPLAY_OPT += -Wno-deprecated-declarations
endif
endif
else
DISPLAYL =
DISPLAYVT =
DISPLAY_OPT =
endif
else
DISPLAYL = ${DISPLAYD}/display.c $(DISPLAYD)/win32.c
DISPLAYVT = ${DISPLAYD}/vt11.c
DISPLAY_OPT = -DUSE_DISPLAY -lgdi32
endif
# #
# Emulator source files and compile time options # Emulator source files and compile time options