diff options
author | Franklin Wei <git@fwei.tk> | 2017-10-23 17:19:29 -0400 |
---|---|---|
committer | Franklin Wei <git@fwei.tk> | 2017-10-23 17:19:29 -0400 |
commit | ef1306764e6443d67612542654f252b376c5993e (patch) | |
tree | 5f064178c1f9a23695b1b52b8bd487434be9006e /apps/plugins/puzzles/src/Buildscr | |
parent | 7a8c9daf7ef5a8b38d4c4f6625ff2d9d8eb1aa0a (diff) | |
download | rockbox-ef1306764e6443d67612542654f252b376c5993e.tar.gz rockbox-ef1306764e6443d67612542654f252b376c5993e.zip |
puzzles: resync with upstream
There have been some improvements with regard to small screen sizes,
which will be nice to have.
Change-Id: I30c740514156258d2818fde325c1a751500f7611
Diffstat (limited to 'apps/plugins/puzzles/src/Buildscr')
-rw-r--r-- | apps/plugins/puzzles/src/Buildscr | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/puzzles/src/Buildscr b/apps/plugins/puzzles/src/Buildscr index b8a585b43e..4a54d277ff 100644 --- a/apps/plugins/puzzles/src/Buildscr +++ b/apps/plugins/puzzles/src/Buildscr | |||
@@ -25,7 +25,7 @@ in puzzles do echo '$#define VER "Version $(Version)"' >> version.h | |||
25 | in puzzles do perl -i -pe 's/Unidentified build/$(Version)/' osx-info.plist | 25 | in puzzles do perl -i -pe 's/Unidentified build/$(Version)/' osx-info.plist |
26 | 26 | ||
27 | # First build some local binaries, to run the icon build. | 27 | # First build some local binaries, to run the icon build. |
28 | in puzzles do perl mkfiles.pl -U | 28 | in puzzles do perl mkfiles.pl -U CFLAGS='-Wwrite-strings -Werror' |
29 | in puzzles do make | 29 | in puzzles do make |
30 | 30 | ||
31 | # Now build the screenshots and icons. | 31 | # Now build the screenshots and icons. |
@@ -45,7 +45,7 @@ in puzzles do ./mkauto.sh | |||
45 | # Build the OS X .dmg archive. | 45 | # Build the OS X .dmg archive. |
46 | delegate osx | 46 | delegate osx |
47 | in puzzles do make -f Makefile.osx clean | 47 | in puzzles do make -f Makefile.osx clean |
48 | in puzzles do make -f Makefile.osx release VER=-DVER=$(Version) | 48 | in puzzles do make -f Makefile.osx release VER=-DVER=$(Version) XFLAGS='-Wwrite-strings -Werror' |
49 | return puzzles/Puzzles.dmg | 49 | return puzzles/Puzzles.dmg |
50 | enddelegate | 50 | enddelegate |
51 | 51 | ||
@@ -56,7 +56,7 @@ in puzzles do mason.pl --args '{"version":"$(Version)","descfile":"gamedesc.txt" | |||
56 | in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss | 56 | in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss |
57 | ifneq "$(VISUAL_STUDIO)" "yes" then | 57 | ifneq "$(VISUAL_STUDIO)" "yes" then |
58 | in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl clean | 58 | in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl clean |
59 | in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl VER=-DVER=$(Version) | 59 | in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl VER=-DVER=$(Version) XFLAGS='-Wwrite-strings -Werror' |
60 | # Code-sign the binaries, if the local bob config provides a script | 60 | # Code-sign the binaries, if the local bob config provides a script |
61 | # to do so. We assume here that the script accepts an -i option to | 61 | # to do so. We assume here that the script accepts an -i option to |
62 | # provide a 'more info' URL, and an optional -n option to provide a | 62 | # provide a 'more info' URL, and an optional -n option to provide a |
@@ -144,7 +144,7 @@ ifneq "$(JAVA_UNFINISHED)" "" in puzzles do perl mkfiles.pl | |||
144 | 144 | ||
145 | # Build the Java applets. | 145 | # Build the Java applets. |
146 | delegate nestedvm | 146 | delegate nestedvm |
147 | in puzzles do make -f Makefile.nestedvm NESTEDVM="$$NESTEDVM" VER=-DVER=$(Version) | 147 | in puzzles do make -f Makefile.nestedvm NESTEDVM="$$NESTEDVM" VER=-DVER=$(Version) XFLAGS="-Wwrite-strings -Werror" |
148 | return puzzles/*.jar | 148 | return puzzles/*.jar |
149 | enddelegate | 149 | enddelegate |
150 | 150 | ||
@@ -154,7 +154,7 @@ enddelegate | |||
154 | in puzzles do mkdir js # so we can tell output .js files from emcc*.js | 154 | in puzzles do mkdir js # so we can tell output .js files from emcc*.js |
155 | delegate emscripten | 155 | delegate emscripten |
156 | in puzzles do make -f Makefile.emcc OUTPREFIX=js/ clean | 156 | in puzzles do make -f Makefile.emcc OUTPREFIX=js/ clean |
157 | in puzzles do make -f Makefile.emcc OUTPREFIX=js/ | 157 | in puzzles do make -f Makefile.emcc OUTPREFIX=js/ XFLAGS="-Wwrite-strings -Werror" |
158 | return puzzles/js/*.js | 158 | return puzzles/js/*.js |
159 | enddelegate | 159 | enddelegate |
160 | 160 | ||