diff --git a/CMakeLists.txt b/CMakeLists.txt index f3e4771b..e1d4171e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,12 @@ # 3 june 2016 cmake_minimum_required(VERSION 2.8.11) +# TODOs +# - silence entering/leaving messages? +# - uname -s for more refined OS control +# - Haiku for haiku +# - debian DESTDIR? https://github.com/andlabs/libui/pull/10 + # the docs say we need to set this up prior to project() set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8") diff --git a/migrate_build/GNUmakefile b/migrate_build/GNUmakefile deleted file mode 100644 index 631495a4..00000000 --- a/migrate_build/GNUmakefile +++ /dev/null @@ -1,77 +0,0 @@ -# 16 october 2015 - -# TODO http://stackoverflow.com/questions/4122831/disable-make-builtin-rules-and-variables-from-inside-the-make-file - -# silence entering/leaving messages -MAKEFLAGS += --no-print-directory - -OUTDIR = out -OBJDIR = .obj - -# MAME does this so :/ -ifeq ($(OS),Windows_NT) - OS = windows -endif - -ifndef OS - UNAME = $(shell uname -s) - ifeq ($(UNAME),Darwin) - OS = darwin - else ifeq ($(UNAME),Haiku) - OS = haiku - else - OS = unix - endif -endif - -# default is to build with debug symbols -ifndef RELEASE - RELEASE = 0 -endif - -# parameters -export OS -# TODO CC, CXX, RC, LD -export CFLAGS -export CXXFLAGS -# TODO RCFLAGS -export LDFLAGS -export RELEASE -export EXAMPLE -export PREFIX - -# for Debian - see https://github.com/andlabs/libui/pull/10 -export DESTDIR - -# other important variables -export OBJDIR -export OUTDIR -export STATIC - -ifneq (,$(STATIC)) -STATICLIB = STATICLIB=1 -endif - -libui: - @$(MAKE) -f build/GNUmakefile.libui inlibuibuild=1 $(STATICLIB) - -clean: - rm -rf $(OBJDIR) $(OUTDIR) - -test: libui - @$(MAKE) -f build/GNUmakefile.test inlibuibuild=1 - -# TODO provide a build option for the queuemaintest - -example: libui - @$(MAKE) -f build/GNUmakefile.example inlibuibuild=1 - -examples: - @$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery - @$(MAKE) -f GNUmakefile example EXAMPLE=histogram - @$(MAKE) -f GNUmakefile example EXAMPLE=cpp-multithread - -.PHONY: examples - -install: - @$(MAKE) -f build/GNUmakefile.libui install inlibuibuild=1 diff --git a/migrate_build/build/GNUbasemsvc.mk b/migrate_build/build/GNUbasemsvc.mk deleted file mode 100644 index e69de29b..00000000 diff --git a/migrate_build/common/GNUfiles.mk b/migrate_build/common/GNUfiles.mk deleted file mode 100644 index 465c76e8..00000000 --- a/migrate_build/common/GNUfiles.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 16 october 2015 - -CFILES += \ - common/areaevents.c \ - common/control.c \ - common/debug.c \ - common/matrix.c \ - common/shouldquit.c \ - common/userbugs.c - -HFILES += \ - common/controlsigs.h \ - common/uipriv.h diff --git a/migrate_build/darwin/GNUosspecificlink.mk b/migrate_build/darwin/GNUosspecificlink.mk deleted file mode 100644 index 0b9087e6..00000000 --- a/migrate_build/darwin/GNUosspecificlink.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 28 may 2016 - -$(OUT): $(OFILES) | $(OUTDIR) -ifeq (,$(STATICLIB)) - @$(reallinker) -o $(OUT) $(OFILES) $(LDFLAGS) -ifeq ($(USESSONAME),1) - @ln -sf $(NAME)$(SUFFIX) $(OUTNOSONAME) -endif -else - nm -m $(OFILES) | sed -E -n 's/^[0-9a-f]* \([A-Z_]+,[a-z_]+\) external //p' > $(OBJDIR)/symbols - $(LD) -exported_symbols_list $(OBJDIR)/symbols -r $(OFILES) -o $(OUT:%.a=%.o) - $(AR) rcs $(OUT) $(OUT:%.a=%.o) -endif - @echo ====== Linked $(OUT) - diff --git a/migrate_build/test/GNUfiles.mk b/migrate_build/test/GNUfiles.mk deleted file mode 100644 index 94f1fa23..00000000 --- a/migrate_build/test/GNUfiles.mk +++ /dev/null @@ -1,31 +0,0 @@ -# 22 april 2015 - -CFILES += \ - test/drawtests.c \ - test/main.c \ - test/menus.c \ - test/page1.c \ - test/page2.c \ - test/page3.c \ - test/page4.c \ - test/page5.c \ - test/page6.c \ - test/page7.c \ - test/page7a.c \ - test/page7b.c \ - test/page7c.c \ - test/page8.c \ - test/page9.c \ - test/page10.c \ - test/page11.c \ - test/page12.c \ - test/page13.c \ - test/spaced.c - -HFILES += \ - test/test.h - -ifeq ($(OS),windows) -RCFILES += \ - test/resources.rc -endif diff --git a/migrate_build/unix/GNUosspecificlink.mk b/migrate_build/unix/GNUosspecificlink.mk deleted file mode 100644 index 573b289f..00000000 --- a/migrate_build/unix/GNUosspecificlink.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 28 may 2016 - -$(OUT): $(OFILES) | $(OUTDIR) -ifeq (,$(STATICLIB)) - @$(reallinker) -o $(OUT) $(OFILES) $(LDFLAGS) -ifeq ($(USESSONAME),1) - @ln -sf $(NAME)$(SUFFIX) $(OUTNOSONAME) -endif -else - $(LD) -r $(OFILES) -o $(OUT:%.a=%.o) - objcopy --localize-hidden $(OUT:%.a=%.o) - $(AR) rcs $(OUT) $(OUT:%.a=%.o) -endif - @echo ====== Linked $(OUT) - diff --git a/migrate_build/windows/GNUfiles.mk b/migrate_build/windows/GNUfiles.mk deleted file mode 100644 index e69de29b..00000000 diff --git a/migrate_build/windows/GNUinstall.mk b/migrate_build/windows/GNUinstall.mk deleted file mode 100644 index 1d783c01..00000000 --- a/migrate_build/windows/GNUinstall.mk +++ /dev/null @@ -1,3 +0,0 @@ -install: - @echo "No install for windows !" - @exit 1 diff --git a/migrate_build/windows/GNUosspecific.mk b/migrate_build/windows/GNUosspecific.mk deleted file mode 100644 index e69de29b..00000000