[geany/geany] 71ce7c: win32: Add some window-specifc LDFLAGS to geany itself as well

Thomas Martitz git-noreply at xxxxx
Sun Jul 5 16:28:20 UTC 2015

Branch:      refs/heads/master
Author:      Thomas Martitz <kugel at rockbox.org>
Committer:   Thomas Martitz <kugel at rockbox.org>
Date:        Sun, 05 Jul 2015 16:28:20 UTC
Commit:      71ce7c077d05353adbe1f0a78cc3c5204ceeb1ec

Log Message:
win32: Add some window-specifc LDFLAGS to geany itself as well

Since we build libgeany some ld flags were applied to libgeany only.
Some of them need to be applied to the main binary as well.

This fixes the problem that a sticky terminal window starts together
with geany.

Modified Paths:

Modified: src/Makefile.am
6 lines changed, 4 insertions(+), 2 deletions(-)
@@ -26,9 +26,10 @@ lib_LTLIBRARIES = libgeany.la
 geany_SOURCES = main.c
 geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS)
+geany_LDFLAGS =
-geany_LDFLAGS = -Wl,-rpath='$$ORIGIN/../lib'
+geany_LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib'
 geany_includedir = $(includedir)/geany
@@ -150,8 +151,9 @@ geany_private.res: $(top_srcdir)/geany_private.rc
 libgeany_la_SOURCES += win32.c win32.h win32defines.h
 libgeany_la_LIBADD  += -lole32 -lwsock32 -lcomdlg32
 libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
+geany_LDFLAGS       += -mwindows -mms-bitfields
-CLEANFILES += geany_private.res
+CLEANFILES          += geany_private.res
 # build Geany for all other platforms

This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

More information about the Commits mailing list