diff options
| author | midipix <writeonce@midipix.org> | 2016-05-11 00:05:15 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-05-11 00:14:45 -0400 |
| commit | a6e0dcb609cefabff2817b2dd7bbc6698c5870d6 (patch) | |
| tree | 5bf3db2a1b0ad26f773708eb7a79f78b8d2bf9f1 /project/extras.mk | |
| parent | 3be73d5188b49d43edfc2bd80dca3d06063b34a3 (diff) | |
| download | dalist-a6e0dcb609cefabff2817b2dd7bbc6698c5870d6.tar.bz2 dalist-a6e0dcb609cefabff2817b2dd7bbc6698c5870d6.tar.xz | |
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.
Diffstat (limited to 'project/extras.mk')
| -rw-r--r-- | project/extras.mk | 19 |
1 files changed, 5 insertions, 14 deletions
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 |