Showing the changes to src (2 of 4 files). Show all
Unified · Split
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | # default target: print usage message and quit |
| 2 | 2 | current: |
| 3 | 3 | @echo "[chuck build]: please use one of the following configurations:" |
| 4 | − @echo " make linux-alsa, make linux-jack, make linux-pulse," | |
| 4 | + @echo " make linux-alsa, make linux-jack, make linux-pulse, linux-all," | |
| 5 | 5 | @echo " make mac, make mac-ub, make cygwin, or make win32" |
| 6 | 6 | |
| 7 | −.PHONY: mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl test | |
| 8 | −mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck-core | |
| 7 | +.PHONY: mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl test | |
| 8 | +mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck-core | |
| 9 | 9 | |
| 10 | 10 | win32: |
| 11 | 11 | make -f makefile.win32 |
| @@ -48,6 +48,10 @@ ifneq (,$(strip $(filter mac mac-ub osx bin-dist-mac,$(MAKECMDGOALS)))) · 36 unmodified lines | ||
| 48 | 48 | include makefile.x/makefile.mac |
| 49 | 49 | endif |
| 50 | 50 | |
| 51 | +ifneq (,$(strip $(filter linux linux-all,$(MAKECMDGOALS)))) | |
| 52 | +include makefile.x/makefile.linux | |
| 53 | +endif | |
| 54 | + | |
| 51 | 55 | ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS)))) |
| 52 | 56 | include makefile.x/makefile.pulse |
| 53 | 57 | endif |
| @@ -112,14 +116,6 @@ ifneq (,$(MAC_UB)) · 58 unmodified lines | ||
| 112 | 116 | ARCHOPTS=-arch arm64 -arch x86_64 |
| 113 | 117 | endif |
| 114 | 118 | |
| 115 | −NOTES=AUTHORS DEVELOPER PROGRAMMER README TODO COPYING INSTALL QUICKSTART \ | |
| 116 | − THANKS VERSIONS | |
| 117 | −BIN_NOTES=README.txt | |
| 118 | −DOC_NOTES=GOTO | |
| 119 | −DIST_DIR=chuck-$(CK_VERSION) | |
| 120 | −DIST_DIR_EXE=chuck-$(CK_VERSION)-exe | |
| 121 | −CK_SVN=https://chuck-dev.stanford.edu/svn/chuck/ | |
| 122 | − | |
| 123 | 119 | # pull in dependency info for *existing* .o files |
| 124 | 120 | -include $(OBJS:.o=.d) |
| 125 | 121 | |
| @@ -1,19 +1,20 @@ | ||
| 1 | 1 | COREDIR=core |
| 2 | 2 | HOSTDIR=host |
| 3 | 3 | RTAUDIODIR=RtAudio |
| 4 | −DESTDIR?=/usr/local/bin | |
| 5 | −CK_PLATFORM= | |
| 4 | +CK_VERSION=1.5.0.3-dev | |
| 6 | 5 | |
| 7 | 6 | |
| 8 | 7 | ########################## DEFAULT MAKE TARGET ################################# |
| 9 | 8 | # default target: print usage message and quit |
| 10 | 9 | current: |
| 11 | − @echo "[chuck build]: please use one of the following configurations:" | |
| 12 | − @echo " make linux-alsa, make linux-jack, make linux-pulse," | |
| 13 | − @echo " make mac, make mac-ub, make cygwin, make win32, or make web" | |
| 10 | + @echo "[chuck build]: please use the following configurations:" | |
| 11 | + @echo " make linux-alsa, make linux-jack, make linux-pulse, linux-all," | |
| 12 | + @echo " make mac, make mac-ub, make web, make cygwin, make win32" | |
| 14 | 13 | |
| 15 | 14 | |
| 16 | 15 | ############################## MAKE INSTALL #################################### |
| 16 | +DESTDIR?=/usr/local/bin | |
| 17 | + | |
| 17 | 18 | install: |
| 18 | 19 | mkdir -p $(DESTDIR) |
| 19 | 20 | cp $(wildcard chuck chuck.exe) $(DESTDIR)/ |
| @@ -68,18 +69,17 @@ host_web/webchuck/js/webchuck.js: $(EMSCRIPTENSRCS) · 48 unmodified lines | ||
| 68 | 69 | |
| 69 | 70 | |
| 70 | 71 | |
| 71 | −############################## MAKE INSTALL #################################### | |
| 72 | +################################ PLATFORMS ##################################### | |
| 72 | 73 | ## note: If you want to build ChucK on linux with multiple audio drivers, |
| 73 | −## call multiple build rules, e.g.: | |
| 74 | +## combine multiple build rules, e.g.: | |
| 74 | 75 | ## > make linux-pulse linux-alsa linux-jack |
| 75 | −.PHONY: mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl test | |
| 76 | −mac mac-ub osx linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck | |
| 76 | + | |
| 77 | +.PHONY: mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl test | |
| 78 | +mac mac-ub osx linux-all linux linux-pulse linux-jack linux-alsa cygwin osx-rl: chuck | |
| 77 | 79 | |
| 78 | 80 | win32: |
| 79 | 81 | make -f $(COREDIR)/makefile.x/makefile.win32 |
| 80 | 82 | |
| 81 | −CK_VERSION=1.5.0.0 | |
| 82 | − | |
| 83 | 83 | |
| 84 | 84 | ########################### COMPILATION TOOLS ################################## |
| 85 | 85 | LEX=flex |
| @@ -121,10 +121,15 @@ endif · 35 unmodified lines | ||
| 121 | 121 | |
| 122 | 122 | |
| 123 | 123 | ######################### PLATFORM-SPECIFIC THINGS ############################# |
| 124 | + | |
| 124 | 125 | ifneq (,$(strip $(filter mac mac-ub osx bin-dist-mac,$(MAKECMDGOALS)))) |
| 125 | 126 | include $(COREDIR)/makefile.x/makefile.mac |
| 126 | 127 | endif |
| 127 | 128 | |
| 129 | +ifneq (,$(strip $(filter linux linux-all,$(MAKECMDGOALS)))) | |
| 130 | +include $(COREDIR)/makefile.x/makefile.linux | |
| 131 | +endif | |
| 132 | + | |
| 128 | 133 | ifneq (,$(strip $(filter linux-pulse,$(MAKECMDGOALS)))) |
| 129 | 134 | include $(COREDIR)/makefile.x/makefile.pulse |
| 130 | 135 | endif |
| @@ -201,14 +206,12 @@ ARCH_ARGS=MAC_UB=true · 70 unmodified lines | ||
| 201 | 206 | CFLAGS+=-D__MACOSX_UB__ |
| 202 | 207 | endif |
| 203 | 208 | |
| 209 | + | |
| 204 | 210 | ############################ DISTRIBUTION INFO ################################# |
| 205 | −NOTES=AUTHORS DEVELOPER PROGRAMMER README TODO COPYING INSTALL QUICKSTART \ | |
| 206 | − THANKS VERSIONS | |
| 207 | −BIN_NOTES=README.txt | |
| 208 | −DOC_NOTES=GOTO | |
| 211 | +# release notes | |
| 212 | +NOTES=AUTHORS DEVELOPERS INSTALL LICENSE QUICKSTART README.md THANKS VERSIONS | |
| 213 | +# where to put the newly constructed distribution | |
| 209 | 214 | DIST_DIR=chuck-$(CK_VERSION) |
| 210 | −DIST_DIR_EXE=chuck-$(CK_VERSION)-exe | |
| 211 | −CK_SVN=https://chuck-dev.stanford.edu/svn/chuck/ | |
| 212 | 215 | |
| 213 | 216 | # pull in dependency info for *existing* .o files |
| 214 | 217 | -include $(OBJS:.o=.d) |
| @@ -259,10 +262,11 @@ src-dist: · 44 unmodified lines | ||
| 259 | 262 | mkdir $(DIST_DIR) $(DIST_DIR)/src $(DIST_DIR)/examples |
| 260 | 263 | # copy src |
| 261 | 264 | git archive HEAD src | tar -x -C $(DIST_DIR) |
| 262 | − rm -r $(DIST_DIR)/src/test | |
| 265 | +# rm -r $(DIST_DIR)/src/test | |
| 263 | 266 | # copy examples |
| 264 | 267 | git archive HEAD examples | tar -x -C $(DIST_DIR) |
| 265 | 268 | # copy notes |
| 266 | − cp $(addprefix notes/,$(NOTES)) $(DIST_DIR) | |
| 269 | + cp $(addprefix ./,$(NOTES)) $(DIST_DIR) | |
| 267 | 270 | # tar/gzip |
| 268 | 271 | tar czf $(DIST_DIR).tgz $(DIST_DIR) |
| 272 | + | |