diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-03 13:53:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-03 13:53:40 +0300 |
| commit | 9002e8749382bff83e644d432fb9908664edfeb2 (patch) | |
| tree | d9beb1f3e507dc6f4176b1d6c6a3454e074f17bb /pango | |
| parent | 56f35e6b3924b0c36146c33dc8c7dcf2c04b39da (diff) | |
Use unique Pango DLL names to avoid risk clashing with "official" DLLs
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/makefile.mk | 6 | ||||
| -rw-r--r-- | pango/pango-1.28.3-win32.patch | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pango/makefile.mk b/pango/makefile.mk index d202de296654..a5c285438cfa 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -122,9 +122,9 @@ OUT2LIB+=pango/pango-1.0.lib OUT2LIB+=pango/pangocairo-1.0.lib OUT2LIB+=pango/pangowin32-1.0.lib -OUT2BIN+=pango/libpango-1.0-0.dll -OUT2BIN+=pango/libpangocairo-1.0-0.dll -OUT2BIN+=pango/libpangowin32-1.0-0.dll +OUT2BIN+=pango/pangolo.dll +OUT2BIN+=pango/pangocairolo.dll +OUT2BIN+=pango/pangowin32lo.dll OUT2BIN+=pango/querymodules.exe OUT2INC+=pango/pango.h diff --git a/pango/pango-1.28.3-win32.patch b/pango/pango-1.28.3-win32.patch index 0aa1155c3a2f..f232d5bf0d21 100644 --- a/pango/pango-1.28.3-win32.patch +++ b/pango/pango-1.28.3-win32.patch @@ -64,6 +64,15 @@ EXES = querymodules testfonts #? test1 test2 test3 test4 test5 +@@ -30,7 +30,7 @@ + nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER)s.lib PACKAGE=$(THIS) OBJS_$(THIS)=1 + + sub-one-dll: +- nmake -nologo -f makefile.msc lib$(THIS)-$(PANGO_VER)-0.dll PACKAGE=$(THIS) OBJS_$(THIS)=1 ++ nmake -nologo -f makefile.msc $(THIS)lo.dll PACKAGE=$(THIS) OBJS_$(THIS)=1 + + sub-one-exe: + nmake -nologo -f makefile.msc $(THIS).exe PACKAGE=$(THIS) OBJS_$(THIS)=1 @@ -40,28 +50,28 @@ !ELSE @@ -185,7 +194,15 @@ --fhead "#include <pango.h>" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -@@ -275,15 +277,6 @@ +@@ -275,22 +277,13 @@ + $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h + lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) + +-lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h ++$(PACKAGE)lo.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) \ + user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PKG_DEF) + $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS) $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) gdi32.lib user32.lib |