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

MAKEFILE: Move CYGWIN library search out of VIDEO section; sync compiler flags with MSVC

Browse source
This commit is contained in:
Tony Lawrence 2023-06-06 22:21:59 -04:00 • committed by Paul Koning
parent 76da2c0da8
commit 2c8938711c
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
makefile
View file

@ -697,11 +697,11 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
endif endif
endif endif
endif endif
ifeq (cygwin,$(OSTYPE))
LIBEXTSAVE := ${LIBEXT}
LIBEXT = dll.a
endif
ifneq (,$(VIDEO_USEFUL)) ifneq (,$(VIDEO_USEFUL))
ifeq (cygwin,$(OSTYPE))
LIBEXTSAVE := ${LIBEXT}
LIBEXT = dll.a
endif
ifneq (,$(call find_include,SDL2/SDL)) ifneq (,$(call find_include,SDL2/SDL))
ifneq (,$(call find_lib,SDL2)) ifneq (,$(call find_lib,SDL2))
ifneq (,$(shell which sdl2-config)) ifneq (,$(shell which sdl2-config))
@ -782,14 +782,6 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
endif endif
endif endif
endif endif
ifeq (cygwin,$(OSTYPE))
LIBEXT = $(LIBEXTSAVE)
LIBPATH += /usr/lib/w32api
ifneq (,$(call find_lib,winmm))
OS_CCDEFS += -DHAVE_WINMM
OS_LDFLAGS += -lwinmm
endif
endif
ifeq (,$(findstring HAVE_LIBSDL,$(VIDEO_CCDEFS))) ifeq (,$(findstring HAVE_LIBSDL,$(VIDEO_CCDEFS)))
$(info *** Info ***) $(info *** Info ***)
$(info *** Info *** The simulator$(BUILD_MULTIPLE) you are building could provide more functionality) $(info *** Info *** The simulator$(BUILD_MULTIPLE) you are building could provide more functionality)
@ -831,6 +823,14 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
$(info *** Info ***) $(info *** Info ***)
endif endif
endif endif
ifeq (cygwin,$(OSTYPE))
LIBEXT = $(LIBEXTSAVE)
LIBPATH += /usr/lib/w32api
ifneq (,$(call find_lib,winmm􀀌􀀋))
OS_CCDEFS += -DHAVE_WINMM
OS_LDFLAGS += -lwinmm
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))
@ -1312,9 +1312,9 @@ endif
ifneq (,$(UNSUPPORTED_BUILD)) ifneq (,$(UNSUPPORTED_BUILD))
CFLAGS_GIT += -DSIM_BUILD=Unsupported=$(UNSUPPORTED_BUILD) CFLAGS_GIT += -DSIM_BUILD=Unsupported=$(UNSUPPORTED_BUILD)
endif endif
OPTIMIZE ?= -O2 OPTIMIZE ?= -O2 -DNDEBUG=1
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
CFLAGS_G = -g -ggdb -g3 CFLAGS_G = -g -ggdb -g3 -D_DEBUG=1
CFLAGS_O = -O0 CFLAGS_O = -O0
BUILD_FEATURES = - debugging support BUILD_FEATURES = - debugging support
LTO = LTO =