On 13/07/15 18:35, Dimitar Zhekov wrote:
> On both my older and newer MinGW-s, make -f makefile.win32 ended up with:
>
> make[1]: Entering directory '.../geany/plugins'
> gcc -O2 -Wall -pipe -mms-bitfields -DHAVE_CONFIG_H -DGTK -I..
> -I../src -I../scintilla/include -I../tagmanager/src
> -Id:/opt/gtk+/include/gtk-2.0 -Id:/opt/gtk+/lib/gtk-2.0/include
> -Id:/opt/gtk+/include/atk-1.0 -Id:/opt/gtk+/include/cairo
> -Id:/opt/gtk+/include/gdk-pixbuf-2.0 -Id:/opt/gtk+/include/pango-1.0
> -Id:/opt/gtk+/include/glib-2.0 -Id:/opt/gtk+/lib/glib-2.0/include
> -Id:/opt/gtk+/include -Id:/opt/gtk+/include/gettext
> -o htmlchars.o -c htmlchars.c gcc -shared htmlchars.o
> -L"d:/opt/gtk+/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
> -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0
> -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl
> -liconv -o htmlchars.dll
>
> htmlchars.o:htmlchars.c:(.text+0x2a): undefined reference to
> `utils_str_equal'
> htmlchars.o:htmlchars.c:(.text+0x3e): undefined reference to
> `utils_str_equal'
> htmlchars.o:htmlchars.c:(.text+0x68): undefined reference to
> `document_get_curre
> nt'
> htmlchars.o:htmlchars.c:(.text+0x7c): undefined reference to
> `sci_has_selection'
> htmlchars.o:htmlchars.c:(.text+0xa8): undefined reference to
> `sci_get_selection_
> contents'
>
>
> Lacking -lgeany perhaps?
Yes, and some more things which are not up2date.
Attached is a simple diff which adds -lgeany and -lgio-2.0.
But there is a make rule missing for signallist.i and maybe more.
> (Personally I'm not a fan of makefile.win32, since you can't build
> geany-plugins with it.)
Is there a reason why you used it?
Waf should do basically and thanks to Thomas' work, building with MSYS2
is very easy and probably the future.
Regards,
Enrico
--
Get my GPG key from http://www.uvena.de/pub.asc
diff --git a/plugins/makefile.win32 b/plugins/makefile.win32
index 28c2b69..5b60256 100644
--- a/plugins/makefile.win32
+++ b/plugins/makefile.win32
@@ -30,10 +30,12 @@ INCLUDEDIRS= -I.. \
-I../tagmanager/src \
$(GTK_INCLUDES)
+GEANY_LIBS = -lgeany
+
ALL_GTK_LIBS= \
-L"$(PREFIX)/lib" \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
- -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl
+ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgio-2.0 -lintl
CBASEFLAGS=-Wall -pipe -mms-bitfields -DHAVE_CONFIG_H
ifdef DEBUG
@@ -55,7 +57,7 @@ all: plugins
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $@ -c $<
.o.dll:
- $(CC) -shared $< $(ALL_GTK_LIBS) $(DLL_LD_FLAGS) -o $@
+ $(CC) -shared $< $(ALL_GTK_LIBS) $(GEANY_LIBS) $(DLL_LD_FLAGS) -o $@
plugins: \
htmlchars.dll \
diff --git a/src/makefile.win32 b/src/makefile.win32
index 147c4e2..52be424 100644
--- a/src/makefile.win32
+++ b/src/makefile.win32
@@ -42,6 +42,8 @@ INCLUDEDIRS= -I.. \
-I../tagmanager/src \
$(GTK_INCLUDES)
+GEANY_LIBS =
+
ALL_GTK_LIBS= \
-L"$(PREFIX)/lib" \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
@@ -87,7 +89,7 @@ STLIBS = ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a \
../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a
$(TARGET): $(OBJS) $(RES) $(STLIBS)
- $(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(WIN_LIBS)
+ $(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(GEANY_LIBS) $(WIN_LIBS)
deps.mak:
$(CC) -MM $(CFLAGS) *.c >deps.mak
signature.asc
Description: OpenPGP digital signature
___
Devel mailing list
Devel@lists.geany.org
https://lists.geany.org/cgi-bin/mailman/listinfo/devel
