diff --git a/.travis.yml b/.travis.yml index f37e9a6..9be5df7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,16 @@ language: c +compiler: gcc +branches: + only: + - ci + - master +sudo: false +dist: trusty +addons: + apt: + packages: + - git + - doxygen install: script: - make init diff --git a/Makefile b/Makefile index 8b41448..c9adbe1 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ SRC_EXTS = c # Location(s) where EzMake should look for `include` and `lib` subdirectories # No biggie if the directory doesn't exist. -PREFIXES = /usr /mingw64 /mingw32 $$HOME +PREFIXES = /usr /usr/local /mingw64 /mingw32 $$HOME # WARNING: Changing these may cause a lot of headache! # Project root directory and submodule directory @@ -103,4 +103,4 @@ init : FORCE : --include $(SUB_DIR)/ezmake/script/ezmake.mk +-include $(ROOT)/$(SUB_DIR)/ezmake/script/ezmake.mk diff --git a/sub/ezmake b/sub/ezmake index 11cd1d6..bd79a92 160000 --- a/sub/ezmake +++ b/sub/ezmake @@ -1 +1 @@ -Subproject commit 11cd1d6726e7be0a632e30b6e4b5d8f32323cb81 +Subproject commit bd79a92a123da135bf1bbeb3f0873677759901fc