Skip to content

Commit

Permalink
win32: Add some window-specifc LDFLAGS to geany itself as well
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kugel- committed Jul 5, 2015
1 parent 9224c3c commit 71ce7c0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ lib_LTLIBRARIES = libgeany.la

geany_SOURCES = main.c
geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS)
geany_LDFLAGS =

if ENABLE_BINRELOC
geany_LDFLAGS = -Wl,-rpath='$$ORIGIN/../lib'
geany_LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib'
endif

geany_includedir = $(includedir)/geany
Expand Down Expand Up @@ -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

else
# build Geany for all other platforms
Expand Down

0 comments on commit 71ce7c0

Please sign in to comment.