diff options
| author | johnnypops <johnnypops> | 2011-07-02 06:03:49 (GMT) |
|---|---|---|
| committer | johnnypops <johnnypops> | 2011-07-02 06:03:49 (GMT) |
| commit | 71974df6fcad3a39b0957725de56fbae86c8afe5 (patch) | |
| tree | 61a52704b3bc0a6e4ffa4e912ed8ecbaacbb4a6a | |
| parent | d90f588cde0288e92bd8b505412770616b9f43e0 (diff) | |
Disable '-fvisibility=hidden' on win32. Updated config file and DLL copying for win32 and win9x.
| -rw-r--r-- | Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -215,7 +215,7 @@ endif #-ffast-math OPTFLAGS:=-O2 CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ - $(call comptest,-fvisibility=hidden,) \ + $(if $(filter windows,$(OS)),,$(call comptest,-fvisibility=hidden,)) \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ -Waggregate-return \ @@ -800,13 +800,17 @@ install-dlls: @cp `which libogg-0.dll` $(BIN_PREFIX) @cp `which libvorbis-0.dll` $(BIN_PREFIX) @cp `which libvorbisfile-3.dll` $(BIN_PREFIX) - @cp `which jpeg.dll` $(BIN_PREFIX) + @cp `which libjpeg-8.dll` $(BIN_PREFIX) + @cp `which libgcc_s_dw2-1.dll` $(BIN_PREFIX) + @cp `which libstdc++-6.dll` $(BIN_PREFIX) + @cp `which libfribidi-0.dll` $(BIN_PREFIX) @if [ "x$(BDIST_WIN9X)" == "x" ]; then \ cp `which libxml2-2.dll` $(BIN_PREFIX); \ cp `which libcairo-2.dll` $(BIN_PREFIX); \ cp `which libfontconfig-1.dll` $(BIN_PREFIX); \ cp `which libSDL_Pango-1.dll` $(BIN_PREFIX); \ cp `which libgobject-2.0-0.dll` $(BIN_PREFIX); \ + cp `which libgthread-2.0-0.dll` $(BIN_PREFIX); \ cp `which librsvg-2-2.dll` $(BIN_PREFIX); \ cp `which libcroco-0.6-3.dll` $(BIN_PREFIX); \ cp `which libgdk_pixbuf-2.0-0.dll` $(BIN_PREFIX); \ @@ -817,7 +821,9 @@ install-dlls: cp `which libpangoft2-1.0-0.dll` $(BIN_PREFIX); \ cp `which libgmodule-2.0-0.dll` $(BIN_PREFIX); \ cp `which libpangowin32-1.0-0.dll` $(BIN_PREFIX); \ - cp `which libfribidi-0.dll` $(BIN_PREFIX); \ + cp `which libpixman-1-0.dll` $(BIN_PREFIX); \ + cp `which libgio-2.0-0.dll` $(BIN_PREFIX); \ + cp `which bz2-1.dll` $(BIN_PREFIX); \ fi @strip -s $(BIN_PREFIX)/*.dll @if [ "x$(BDIST_WIN9X)" == "x" ]; then \ @@ -826,14 +832,11 @@ install-dlls: cp -R win32/etc/ $(BIN_PREFIX); \ echo; \ echo "...Installing Library Modules..."; \ - mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/engines; \ - cp /usr/local/lib/gtk-2.0/2.10.0/engines/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/engines; \ - strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/engines/*.dll; \ - mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/immodules; \ - cp /usr/local/lib/gtk-2.0/2.10.0/immodules/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/immodules; \ - strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/immodules/*.dll; \ + mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ + cp /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders; \ + strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; \ mkdir -p $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ - cp /usr/local/lib/gtk-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ + cp /usr/local/lib/gtk-2.0/loaders/*.dll $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders; \ strip -s $(BIN_PREFIX)/lib/gtk-2.0/2.10.0/loaders/*.dll; \ mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \ |