forked from AuroraMiddleware/gtk
Bypass libtool for linking with libuuid on win32
Fixes a regression introduced in 07d49ee5
.
Libtool by default refuses to link static libraries into shared
libraries. In Windows, libuuid is however a static library and needed
for shared libgtk; as a work around, use "-Wl,-luuid" to pass the option
directly to the linker.
https://bugzilla.gnome.org/show_bug.cgi?id=642214
This commit is contained in:
parent
a817b4763d
commit
c064808a1a
@ -894,10 +894,9 @@ libgtk_3_la_LDFLAGS = $(libtool_opts)
|
||||
libgtk_3_la_LIBADD = $(libadd)
|
||||
libgtk_3_la_DEPENDENCIES = $(deps)
|
||||
|
||||
#libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
|
||||
|
||||
if USE_WIN32
|
||||
libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
|
||||
libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
|
||||
libgtk_3_la_LDFLAGS += -Wl,-luuid
|
||||
libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
|
||||
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user