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

makefile: Correct advice about how to install libvdeplug

Browse source 
Additionally, only warn about potentially missing ttf support when
building a BESM6 simulator.
This commit is contained in:
Mark Pizzolato 2016-10-11 10:17:37 -07:00
parent 6a1487e5bf
commit 5f1ee6ed67
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
makefile
View file

@ -517,9 +517,9 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
$(info *** Info *** Install the development components of libSDL or libSDL2) $(info *** Info *** Install the development components of libSDL or libSDL2)
$(info *** Info *** packaged for your operating system distribution for) $(info *** Info *** packaged for your operating system distribution for)
$(info *** Info *** your Linux system:) $(info *** Info *** your Linux system:)
$(info *** Info *** # apt-get install libsdl2-dev) $(info *** Info *** $$ sudo apt-get install libsdl2-dev)
$(info *** Info *** or) $(info *** Info *** or)
$(info *** Info *** # apt-get install libsdl-dev) $(info *** Info *** $$ sudo apt-get install libsdl-dev)
else else
$(info *** Info *** Install the development components of libSDL packaged by your) $(info *** Info *** Install the development components of libSDL packaged by your)
$(info *** Info *** operating system distribution and rebuild your simulator to) $(info *** Info *** operating system distribution and rebuild your simulator to)
@ -649,7 +649,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get))) ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get)))
$(info *** Warning *** should install the libpcap development components for) $(info *** Warning *** should install the libpcap development components for)
$(info *** Warning *** for your Linux system:) $(info *** Warning *** for your Linux system:)
$(info *** Warning *** # apt-get install libpcap-dev) $(info *** Warning *** $$ sudo apt-get install libpcap-dev)
else else
$(info *** Warning *** should read 0readme_ethernet.txt and follow the instructions) $(info *** Warning *** should read 0readme_ethernet.txt and follow the instructions)
$(info *** Warning *** regarding the needed libpcap development components for your) $(info *** Warning *** regarding the needed libpcap development components for your)
@ -700,7 +700,11 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get))) ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get)))
$(info *** Info *** should install the vde2 package to provide this) $(info *** Info *** should install the vde2 package to provide this)
$(info *** Info *** functionality for your $(OSNAME) system:) $(info *** Info *** functionality for your $(OSNAME) system:)
$(info *** Info *** # apt-get install vde2) ifneq (,$(shell apt list 2>/dev/null| grep libvdeplug-dev))
$(info *** Info *** $$ sudo apt-get install libvdeplug-dev)
else
$(info *** Info *** $$ sudo apt-get install vde2)
endif
else else
$(info *** Info *** should read 0readme_ethernet.txt and follow the instructions) $(info *** Info *** should read 0readme_ethernet.txt and follow the instructions)
$(info *** Info *** regarding the needed libvdeplug components for your $(OSNAME)) $(info *** Info *** regarding the needed libvdeplug components for your $(OSNAME))
@ -1405,21 +1409,21 @@ ifneq (,$(BESM6_BUILD))
$(info ***) $(info ***)
endif endif
endif endif
endif ifeq (,$(and ${VIDEO_LDFLAGS}, ${FONTFILE}, $(BESM6_BUILD)))
ifeq (,$(and ${VIDEO_LDFLAGS}, ${FONTFILE}, $(BESM6_BUILD)))
$(info *** No SDL ttf support available. BESM-6 video panel disabled.) $(info *** No SDL ttf support available. BESM-6 video panel disabled.)
$(info ***) $(info ***)
BESM6_OPT = -I ${BESM6D} -DUSE_INT64 BESM6_OPT = -I ${BESM6D} -DUSE_INT64
else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf))) else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))
$(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf)) $(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf))
$(info ***) $(info ***)
BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf
else ifneq (,$(and $(call find_include,SDL/SDL_ttf),$(call find_lib,SDL_ttf))) else ifneq (,$(and $(call find_include,SDL/SDL_ttf),$(call find_lib,SDL_ttf)))
$(info using libSDL_ttf: $(call find_lib,SDL_ttf) $(call find_include,SDL/SDL_ttf)) $(info using libSDL_ttf: $(call find_lib,SDL_ttf) $(call find_include,SDL/SDL_ttf))
$(info ***) $(info ***)
BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL_ttf BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL_ttf
else else
BESM6_OPT = -I ${BESM6D} -DUSE_INT64 BESM6_OPT = -I ${BESM6D} -DUSE_INT64
endif
endif endif
### ###