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

Added logic to suggest libSDL might help with simulators what can use it when it isn't available.

Browse source
This commit is contained in:
Mark Pizzolato 2013-06-12 19:20:55 -07:00
parent 0109d04ae4
commit b5e3d6b280
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
makefile
View file

@ -320,6 +320,16 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
$(info using libSDL: $(call find_lib,SDL) $(call find_include,SDL/SDL))
endif
endif
ifneq (,$(VIDEO_USEFUL))
ifeq (,$(findstring HAVE_LIBSDL,$(OS_CCDEFS)))
$(info *** Warning ***)
$(info *** Warning *** The simulator$(BUILD_MULTIPLE) you are building could provide more)
$(info *** Warning *** functionality if video support were available on your system.)
$(info *** Warning *** Install the development components of libSDL and rebuild)
$(info *** Warning *** your simulator to enable this extra functionality.)
$(info *** Warning ***)
endif
endif
ifneq (,$(NETWORK_USEFUL))
ifneq (,$(call find_include,pcap))
ifneq (,$(call find_lib,$(PCAPLIB)))
@ -511,6 +521,7 @@ else
ifeq (libSDL,$(shell if exist ..\windows-build\libSDL\SDL-1.2.15\include\SDL.h echo libSDL))
OS_CCDEFS += -DHAVE_LIBSDL -I..\windows-build\libSDL\SDL-1.2.15\include
OS_LDFLAGS += -lSDL -lSDLmain -L..\windows-build\libSDL\SDL-1.2.15\lib
VIDEO_FEATURES = - video capabilities provided by libSDL (Simple Directmedia Layer)
else
$(info ***********************************************************************)
$(info ***********************************************************************)
@ -613,6 +624,9 @@ ifneq (clean,$(MAKECMDGOALS))
ifneq (,$(NETWORK_FEATURES))
$(info *** $(NETWORK_FEATURES).)
endif
ifneq (,$(VIDEO_FEATURES))
$(info *** $(VIDEO_FEATURES).)
endif
ifneq (,$(GIT_COMMIT_ID))
$(info ***)
$(info *** git commit id is $(GIT_COMMIT_ID).)