From a6e0dcb609cefabff2817b2dd7bbc6698c5870d6 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 11 May 2016 00:05:15 -0400 Subject: build system: upgrade build system, eliminate differences in core definitions. Prior to this patch, there were several differences between this project's build system and the one from which it was derived (sofort). Although the differences were very minor and for the most part related to this project being part of a free-standing, midipix-specific development framework, they still added an extra maintenance burden, specifically by requiring that common changes be applied via patch(1) rather than git-am(1). Following recent improvements to the common build system, it is now possible to have a free-standing, midipix-specific project without any changes to the core build system files, hence the current upgrade. --- project/extras.mk | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'project/extras.mk') diff --git a/project/extras.mk b/project/extras.mk index 084804c..8b53022 100644 --- a/project/extras.mk +++ b/project/extras.mk @@ -1,26 +1,17 @@ CFLAGS_SHARED_ATTR += -DDALIST_BUILD CFLAGS_STATIC_ATTR += -DDALIST_STATIC -ifeq ($(OS),midipix) - HOST_FMT = pe -else ifeq ($(OS),mingw) - HOST_FMT = pe -else - HOST_FMT = unknown -endif - -ifeq ($(HOST_FMT),pe) - CFLAGS_CONFIG += -DMIDIPIX_FREESTANDING -ffreestanding -D__NT$(HOST_BITS) +ifeq ($(OS_BINFMT),PE) + CFLAGS_CONFIG += -DMIDIPIX_FREESTANDING -D__NT$(HOST_BITS) CFLAGS_CONFIG += -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ CFLAGS_CONFIG += -UWIN64 -U_WIN64 -U__WIN64 -U__WIN64__ - LDFLAGS_SHARED += -nostdlib - LDFLAGS_SHARED += -Wl,--out-implib,$(SHARED_IMPLIB) LDFLAGS_SHARED += -Wl,--exclude-all-symbols + LDFLAGS_SHARED += -nostdlib ifeq ($(HOST_BITS),32) - LDFLAGS_SHARED += -Wl,--entry,$(HOST_UNDERSCORE)dalist_entry_point@12 + LDFLAGS_SHARED += -Wl,--entry -Wl,$(HOST_UNDERSCORE)dalist_entry_point@12 else - LDFLAGS_SHARED += -Wl,--entry,$(HOST_UNDERSCORE)dalist_entry_point + LDFLAGS_SHARED += -Wl,--entry -Wl,$(HOST_UNDERSCORE)dalist_entry_point endif endif -- cgit v1.2.3