Mercurial > hg > th-libs
changeset 599:ee165ef28b6f
Improve few Makefile comments.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 14 Jan 2020 02:57:54 +0200 |
| parents | a6196e19465b |
| children | 492633200ddd |
| files | Makefile Makefile.cross-mingw Makefile.inc |
| diffstat | 3 files changed, 24 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Jan 14 02:43:40 2020 +0200 +++ b/Makefile Tue Jan 14 02:57:54 2020 +0200 @@ -1,14 +1,13 @@ -# -# Configuration settings for Linux and generic UNIX -# See other Makefile.* files for more options. -# +### +### Configuration settings for Linux and generic UNIX +### # Miscellaneous -BINTOOL_PREFIX = -PREFIX = /usr/local -BINPATH = ./ -OBJPATH = obj/unix/ -BINEXT = +BINTOOL_PREFIX ?= +PREFIX ?= /usr/local +BINPATH ?= ./ +OBJPATH ?= obj/unix/ +BINEXT ?= # Compiler flags and linker flags CFLAGS += -DHAVE_CONFIG_H
--- a/Makefile.cross-mingw Tue Jan 14 02:43:40 2020 +0200 +++ b/Makefile.cross-mingw Tue Jan 14 02:57:54 2020 +0200 @@ -1,20 +1,28 @@ -# -# For Win32/Win64 version cross-compilation via MinGW -# compiler suite under Linux/Unix +### +### For Win32/Win64 version cross-compilation via MinGW +### compiler suite under Linux/Unix +### # # This Makefile assumes that you have MinGW installed under /usr -# the way Debian MinGW packages do. +# the way Debian MinGW packages do. It also assumes that you have +# built/installed libogg, Tremor, libpng16, SDL2 ad SDL2_ttf under +# __ /usr/local __ (not /usr!) in similar fashion. +# # For differing configurations you will have to either edit this # file or alternatively provide make parameters, e.g. # -# make -f Makefile.cross-mingw MINGW=64 BINTOOL_PREFIX=/opt/zoo/bar/ +# make -f Makefile.cross-mingw MINGW=64 BINTOOL_PREFIX=foo-bar-zoo # ifeq ($(MINGW),64) BINTOOL_PREFIX ?= x86_64-w64-mingw32- +MINGW_SYS_PATH ?= /usr/x86_64-w64-mingw32 +MINGW_LOCAL_PATH ?= /usr/local/x86_64-w64-mingw32 OBJPATH ?= ./obj/win64/ else BINTOOL_PREFIX ?= i686-w64-mingw32- +MINGW_SYS_PATH ?= /usr/i686-w64-mingw32 +MINGW_LOCAL_PATH ?= /usr/local/i686-w64-mingw32 OBJPATH ?= ./obj/win32/ endif
--- a/Makefile.inc Tue Jan 14 02:43:40 2020 +0200 +++ b/Makefile.inc Tue Jan 14 02:57:54 2020 +0200 @@ -1,5 +1,5 @@ ### -### Paths and directories +### Tools, paths and directories ### ifneq ($(BINTOOL_PREFIX),) CC = $(BINTOOL_PREFIX)gcc @@ -19,7 +19,7 @@ ### -### Targets +### Main th-libs targets ### THLIBS_A = $(OBJPATH)thlibs.a THLIBS_DEP += $(THLIBS)th_types.h $(THLIBS)th_util.h @@ -63,7 +63,7 @@ ### -### Target rules +### Generic target rules ### all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)