janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Fix MinGW build machinery machinery

Browse source 
This commit makes it possible to successfully run "make all" against ytools'
again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major
tweaks here and there.

The biggest diff is a move of the architecture-related definitions into
platform.mk. The are needed pretty early on, so that seems reasonable.

Making this work again is part of the larger effort to support cross
buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw))
all over the place. TARGET's relevance should dwindle, until it's finally taken
over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-02 17:21:48 +00:00
commit f9d398d219
7 changed files with 140 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/proj.mk
View file

@ -48,22 +48,3 @@ CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS
PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG)
PROJECT_CPPFLAGS += $(DEBUG_FORMAT_FLAG)
PROJECT_LDFLAGS += $(DEBUG_FORMAT_FLAG)
# need to do this before
include $(MODDIR)/make/platform.mk
ifeq ($(TARGET),mingw)
CONTRIB_DLL = \
iconv \
libglib-2.0-0 \
intl \
libgnurx-0
# msvcirt \
# msvcp71d \
# msvcp71 \
# msvcr71d \
# msvcr71
CONTRIB_LIBS += $(addsuffix .dll,$(CONTRIB_DLL))
PROJECT_LDFLAGS += -lgnurx
endif