Enable socket support when cross-compiling.

Enable plugin compilation when cross-compiling.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3594 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-02-24 18:25:41 +00:00
parent a75ed4d6e2
commit a6eda7c875
3 changed files with 45 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2009-02-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* configure.in, plugins/Makefile.am:
Enable socket support when cross-compiling.
Enable plugin compilation when cross-compiling.
2009-02-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* src/editor.c: Set cursor for LaTeX at auto closing of environment

View File

@ -173,7 +173,8 @@ case "${host}" in
])
AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
want_vte="no"
want_socket="no"
want_socket="yes"
AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
AC_EXEEXT
AM_CONDITIONAL(MINGW, true)
;;

View File

@ -31,6 +31,41 @@ splitwindow_la_LDFLAGS = -module -avoid-version
if PLUGINS
if MINGW
# build Geany for Windows on non-Windows systems (cross-compile)
# (this is a little hack'ish and surely can be improved)
DLL_LD_FLAGS = -module -avoid-version
MINGW_CFLAGS = \
-DGEANY_DATADIR=\"data\" \
-DHAVE_CONFIG_H \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tagmanager/include \
-I$(top_srcdir)/scintilla/include \
$(GTK_CFLAGS) \
$(PLUGIN_CFLAGS)
.PHONY: all clean
all-local: \
classbuilder.dll \
htmlchars.dll \
export.dll \
vcdiff.dll \
saveactions.dll \
filebrowser.dll
# Split Window is broken on Windows
# splitwindow.dll
.c.dll:
$(CC) $(MINGW_CFLAGS) -o $@.o -c $<
$(CC) -shared $@.o $(GTK_LIBS) $(DLL_LD_FLAGS) -o $@
clean:
rm -f *.o *.dll
else
# Plugins to be installed
plugin_LTLIBRARIES = \
classbuilder.la \
@ -64,6 +99,7 @@ saveactions_la_LIBADD = $(GTK_LIBS)
filebrowser_la_LIBADD = $(GTK_LIBS)
splitwindow_la_LIBADD = $(GTK_LIBS)
endif # MINGW
endif # PLUGINS
AM_CPPFLAGS = \