vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
peteruithoven 2017-06-23 12:36:16 +02:00
parent daed62937c 2acb06c3ed
commit f8032d7411
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -48,9 +48,9 @@ define Build/Compile
# grunt can access git info # grunt can access git info
npm install npm install
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y) ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
grunt gitinfo less autoprefixer cssmin concat uglify grunt gitinfo template less autoprefixer cssmin concat uglify
else else
grunt gitinfo less autoprefixer cssmin concat grunt gitinfo template less autoprefixer cssmin concat
endif endif
# Copy compiled files to build dir # Copy compiled files to build dir
$(CP) www $(PKG_BUILD_DIR)/ $(CP) www $(PKG_BUILD_DIR)/