Commit 144f52e5c9d36cc8c76d3a0f6d0dab5ee36bd04a
1 parent
1388ed24
Exists in
master
and in
5 other branches
gdk loaders are no longer necessary on windows.
Showing
1 changed file
with
11 additions
and
11 deletions
Show diff stats
win/makeruntime.sh.in
@@ -33,7 +33,7 @@ PKG_CONFIG="@PKG_CONFIG@" | @@ -33,7 +33,7 @@ PKG_CONFIG="@PKG_CONFIG@" | ||
33 | GTK_VERSION="gtk+-@GTK_VERSION@" | 33 | GTK_VERSION="gtk+-@GTK_VERSION@" |
34 | 34 | ||
35 | GTK_PREFIX=$($PKG_CONFIG --variable=prefix ${GTK_VERSION}) | 35 | GTK_PREFIX=$($PKG_CONFIG --variable=prefix ${GTK_VERSION}) |
36 | -GDK_LOADERS=$(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0 | sed -e "s@${prefix}@@g") | 36 | +# GDK_LOADERS=$(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0 | sed -e "s@${prefix}@@g") |
37 | 37 | ||
38 | TARGET="@BASEDIR@/.bin/runtime" | 38 | TARGET="@BASEDIR@/.bin/runtime" |
39 | BINDIR="@BASEDIR@/.bin/Release/" | 39 | BINDIR="@BASEDIR@/.bin/Release/" |
@@ -194,15 +194,15 @@ copy_locale() { | @@ -194,15 +194,15 @@ copy_locale() { | ||
194 | 194 | ||
195 | } | 195 | } |
196 | 196 | ||
197 | -copy_loaders() { | ||
198 | - | ||
199 | - mkdir -p "${TARGET}/${GDK_LOADERS}" | ||
200 | - cp -rv "${prefix}/${GDK_LOADERS}/loaders" "${TARGET}/${GDK_LOADERS}" | ||
201 | - if [ "$?" != "0" ]; then | ||
202 | - exit -1 | ||
203 | - fi | ||
204 | - | ||
205 | -} | 197 | +#copy_loaders() { |
198 | +# | ||
199 | +# mkdir -p "${TARGET}/${GDK_LOADERS}" | ||
200 | +# cp -rv "${prefix}/${GDK_LOADERS}/loaders" "${TARGET}/${GDK_LOADERS}" | ||
201 | +# if [ "$?" != "0" ]; then | ||
202 | +# exit -1 | ||
203 | +# fi | ||
204 | +# | ||
205 | +#} | ||
206 | 206 | ||
207 | copy_schemes() { | 207 | copy_schemes() { |
208 | 208 | ||
@@ -317,7 +317,7 @@ done | @@ -317,7 +317,7 @@ done | ||
317 | # | 317 | # |
318 | copy_dll | 318 | copy_dll |
319 | copy_locale | 319 | copy_locale |
320 | -copy_loaders | 320 | +# copy_loaders |
321 | copy_schemes | 321 | copy_schemes |
322 | copy_theme "Adwaita" | 322 | copy_theme "Adwaita" |
323 | 323 |