index f108c2c2feb9dff80eb30a198e92c2533f1faf03..81c3d6ef6d472ea066f7ef9213cdb9ac03b0df3a 100644 (file)
--- a/src/pedro/Makefile.mingw
+++ b/src/pedro/Makefile.mingw
# Authors:
# Bob Jamison
#
# Authors:
# Bob Jamison
#
-# Copyright (C) 2005-2006 Bob Jamison
+# Copyright (C) 2005-2007 Bob Jamison
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
ifeq ($(ARCH),win32)
####### Where is your GTK directory?
ifeq ($(ARCH),win32)
####### Where is your GTK directory?
-GTK=c:/gtk28
+GTK=c:/gtk210
####### Same thing, DOS style
####### Same thing, DOS style
-GTKDOS=c:\gtk28
+GTKDOS=c:\gtk210
#SSL=openssl-0.9.8a
SSL=$(GTK)
#SSL=openssl-0.9.8a
SSL=$(GTK)
-CFLAGS = -g -Wall -DHAVE_SSL
+
+
+CFLAGS = -g -Wall -DHAVE_SSL \
+-DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }"
+
INC = -I. -I$(GTK)/include -I$(SSL)/include
INC = -I. -I$(GTK)/include -I$(SSL)/include
all: test.exe pedro.exe
GTKINC = -DGLIBMM_DLL \
all: test.exe pedro.exe
GTKINC = -DGLIBMM_DLL \
--I$(GTK)/include/glibmm-2.4 -I$(GTK)/lib/glibmm-2.4/include \
--I$(GTK)/include/gtkmm-2.4 -I$(GTK)/lib/gtkmm-2.4/include \
--I$(GTK)/include/gdkmm-2.4 -I$(GTK)/lib/gdkmm-2.4/include \
--I$(GTK)/include/pangomm-1.4 \
--I$(GTK)/include/atkmm-1.6 -I$(GTK)/include/cairo \
--I$(GTK)/include/sigc++-2.0 -I$(GTK)/lib/sigc++-2.0/include \
--I$(GTK)/include/gtk-2.0 -I$(GTK)/lib/gtk-2.0/include \
--I$(GTK)/include/atk-1.0 -I$(GTK)/include/pango-1.0 \
--I$(GTK)/include/glib-2.0 -I$(GTK)/lib/glib-2.0/include
-
+-I$(GTK)/include/glibmm-2.4 -I$(GTK)/lib/glibmm-2.4/include \
+-I$(GTK)/include/gtkmm-2.4 -I$(GTK)/lib/gtkmm-2.4/include \
+-I$(GTK)/include/gdkmm-2.4 -I$(GTK)/lib/gdkmm-2.4/include \
+-I$(GTK)/include/pangomm-1.4 -I$(GTK)/include/pangomm-1.4 \
+-I$(GTK)/include/atkmm-1.6 -I$(GTK)/include/cairomm-1.0 \
+-I$(GTK)/include/sigc++-2.0 -I$(GTK)/lib/sigc++-2.0/include \
+-I$(GTK)/include/gtk-2.0 -I$(GTK)/lib/gtk-2.0/include \
+-I$(GTK)/include/atk-1.0 -I$(GTK)/include/pango-1.0 \
+-I$(GTK)/include/glib-2.0 -I$(GTK)/lib/glib-2.0/include \
+-I$(GTK)/include/cairo
####### Our Gtk libs
####### Our Gtk libs
-GTKLIBS = -L$(GTK)/lib -lloudmouth-1 \
+GTKLIBS = -L$(GTK)/lib \
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 \
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0 \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 \
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 \
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0 \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 \
GUIOBJ = \
pedrogui.o \
GUIOBJ = \
pedrogui.o \
+geckoembed.o \
pedromain.o
pedromain.o
groupchat: libpedro.a work/groupchat.o
$(CXX) -o $@ work/groupchat.o libpedro.a $(LIBSC)
groupchat: libpedro.a work/groupchat.o
$(CXX) -o $@ work/groupchat.o libpedro.a $(LIBSC)
-pedro.exe: libpedro.a pedromain.o pedrogui.o
+pedro.exe: libpedro.a $(GUIOBJ)
$(CXX) -o $@ pedromain.o pedrogui.o libpedro.a $(GTKLIBS) $(LIBS)
pedro: libpedro.a pedromain.o pedrogui.o
$(CXX) -o $@ pedromain.o pedrogui.o libpedro.a $(GTKLIBS) $(LIBS)
$(CXX) -o $@ pedromain.o pedrogui.o libpedro.a $(GTKLIBS) $(LIBS)
pedro: libpedro.a pedromain.o pedrogui.o
$(CXX) -o $@ pedromain.o pedrogui.o libpedro.a $(GTKLIBS) $(LIBS)
pedrogui.o: pedrogui.cpp pedrogui.h
$(CXX) $(CFLAGS) $(INC) $(GTKINC) -c -o $@ $<
pedrogui.o: pedrogui.cpp pedrogui.h
$(CXX) $(CFLAGS) $(INC) $(GTKINC) -c -o $@ $<
+geckoembed.o: geckoembed.cpp geckoembed.h
+ $(CXX) $(CFLAGS) $(INC) $(GTKINC) -c -o $@ $<
+
.cpp.o:
$(CXX) $(CFLAGS) $(INC) -c -o $@ $<
.cpp.o:
$(CXX) $(CFLAGS) $(INC) -c -o $@ $<