mirror of
https://github.com/cc65/cc65.git
synced 2025-02-25 16:29:08 +00:00
Removed references to $TRAVIS from Makefiles.
After all it seems much cleaner to explicitly control the behaviour from the .travis.yml file than to behave differently "under the hood" when detecting a Travis CI build.
This commit is contained in:
parent
4ea84c4843
commit
1d6000213c
@ -3,8 +3,10 @@ language:
|
|||||||
install:
|
install:
|
||||||
- sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686
|
- sudo apt-get install linuxdoc-tools linuxdoc-tools-info binutils-mingw-w64-i686 gcc-mingw-w64-i686
|
||||||
script:
|
script:
|
||||||
- make
|
- make bin USER_CFLAGS=-Werror
|
||||||
- make -C src clean bin CROSS_COMPILE=i686-w64-mingw32-
|
- make lib QUIET=1
|
||||||
|
- make -C src clean
|
||||||
|
- make bin USER_CFLAGS=-Werror CROSS_COMPILE=i686-w64-mingw32-
|
||||||
- make doc zip
|
- make doc zip
|
||||||
after_success:
|
after_success:
|
||||||
- make -f Makefile.gh-pages
|
- make -f Makefile.gh-pages
|
||||||
|
@ -253,14 +253,14 @@ export CC65_HOME := $(abspath ..)
|
|||||||
|
|
||||||
define ASSEMBLE_recipe
|
define ASSEMBLE_recipe
|
||||||
|
|
||||||
$(if $(TRAVIS),,@echo $(TARGET) - $<)
|
$(if $(QUIET),,@echo $(TARGET) - $<)
|
||||||
@$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
|
@$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
|
||||||
|
|
||||||
endef # ASSEMBLE_recipe
|
endef # ASSEMBLE_recipe
|
||||||
|
|
||||||
define COMPILE_recipe
|
define COMPILE_recipe
|
||||||
|
|
||||||
$(if $(TRAVIS),,@echo $(TARGET) - $<)
|
$(if $(QUIET),,@echo $(TARGET) - $<)
|
||||||
@$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
|
@$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
|
||||||
@$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
|
@$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
|
||||||
|
|
||||||
|
11
src/Makefile
11
src/Makefile
@ -30,13 +30,20 @@ LD65_CFG = $(datadir)/cfg
|
|||||||
CC = $(CROSS_COMPILE)gcc
|
CC = $(CROSS_COMPILE)gcc
|
||||||
AR = $(CROSS_COMPILE)ar
|
AR = $(CROSS_COMPILE)ar
|
||||||
|
|
||||||
|
ifdef CROSS_COMPILE
|
||||||
|
$(info CC: $(CC))
|
||||||
|
$(info AR: $(AR))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef USER_CFLAGS
|
||||||
|
$(info USER_CFLAGS: $(USER_CFLAGS))
|
||||||
|
endif
|
||||||
|
|
||||||
CFLAGS += -MMD -MP -O -I common \
|
CFLAGS += -MMD -MP -O -I common \
|
||||||
-Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
|
-Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
|
||||||
-DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
|
-DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
|
||||||
-DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
|
-DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
|
||||||
|
|
||||||
CFLAGS += $(if $(TRAVIS),-Werror)
|
|
||||||
|
|
||||||
LDLIBS += -lm
|
LDLIBS += -lm
|
||||||
|
|
||||||
ifdef CMD_EXE
|
ifdef CMD_EXE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user