0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-12-04 05:54:55 +01:00

Merge branch 'develop'

This commit is contained in:
peteruithoven 2017-06-23 12:36:16 +02:00
commit f8032d7411

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)/