diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-01-11 17:41:13 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-01-11 17:41:13 +0000 |
| commit | c7beefbb76d352316d66dacbd917ad37335710cf (patch) | |
| tree | fb840253117895799f96e80e04b2b817a9fe2316 | |
| parent | fix 1632748 (diff) | |
| download | inkscape-c7beefbb76d352316d66dacbd917ad37335710cf.tar.gz inkscape-c7beefbb76d352316d66dacbd917ad37335710cf.zip | |
Updated to work with gtk210 and new code
(bzr r2180)
| -rw-r--r-- | Makefile.mingw | 17 | ||||
| -rw-r--r-- | Makefile.mingw.common | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 81d7491d6..dc827ca4e 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -21,8 +21,8 @@ src$(S)deptool.exe: src$(S)deptool.cpp src$(S)make.dep: src$(S)deptool.exe cd src && deptool.exe -$(GTKDOS)$(S)bin$(S)intl.dll: - $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll $(GTKDOS)$(S)bin$(S)intl.dll +$(GTKDOS)$(S)bin$(S)libintl-2.dll: + $(CP) $(GTKDOS)$(S)bin$(S)intl.dll $(GTKDOS)$(S)bin$(S)libintl-2.dll ################################### # @@ -73,8 +73,8 @@ dist: generated $(MKDIR) inkscape $(CP) src$(S)inkscape.exe inkscape $(CP) src$(S)inkscape.dbg inkscape -# $(CP) src$(S)inkview.exe inkscape -# $(CP) src$(S)inkview.dbg inkscape + $(CP) src$(S)inkview.exe inkscape + $(CP) src$(S)inkview.dbg inkscape $(CP) AUTHORS inkscape $(CP) COPYING inkscape $(CP) COPYING.LIB inkscape @@ -99,6 +99,7 @@ dist: generated $(CP) $(GTKDOS)$(S)bin$(S)libgtk-win32-2.0-0.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)libgthread-2.0-0.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)libcairo-2.dll inkscape + $(CP) $(GTKDOS)$(S)bin$(S)libcairomm-1.0-1.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)libpangocairo-1.0-0.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)libpango-1.0-0.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)libpangoft2-1.0-0.dll inkscape @@ -114,11 +115,11 @@ dist: generated $(CP) $(GTKDOS)$(S)bin$(S)msvcr71.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)zlib1.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)iconv.dll inkscape - $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll inkscape - $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll inkscape$(S)intl.dll + $(CP) $(GTKDOS)$(S)bin$(S)intl.dll inkscape + $(CP) $(GTKDOS)$(S)bin$(S)intl.dll inkscape$(S)libintl-2.dll $(CP) $(GTKDOS)$(S)bin$(S)popt1.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)liblcms-1.dll inkscape - $(CP) $(GTKDOS)$(S)bin$(S)libloudmouth-1-0.dll inkscape +# $(CP) $(GTKDOS)$(S)bin$(S)libloudmouth-1-0.dll inkscape # # PERL # @@ -144,7 +145,7 @@ dist: generated $(CPDIR) $(GTKDOS)$(S)lib$(S)gtk-2.0 inkscape$(S)lib$(S)gtk-2.0 $(CPDIR) $(GTKDOS)$(S)lib$(S)glib-2.0 inkscape$(S)lib$(S)glib-2.0 $(CPDIR) $(GTKDOS)$(S)lib$(S)locale inkscape$(S)lib$(S)locale - $(CPDIR) $(GTKDOS)$(S)lib$(S)pango inkscape$(S)lib$(S)pango +# $(CPDIR) $(GTKDOS)$(S)lib$(S)pango inkscape$(S)lib$(S)pango # $(MKDIR) inkscape$(S)fonts # $(CP) $(GTKDOS)$(S)fonts$(S)*.ttf inkscape$(S)fonts $(CPDIR) share inkscape$(S)share diff --git a/Makefile.mingw.common b/Makefile.mingw.common index 943583dd6..ba5e6739b 100644 --- a/Makefile.mingw.common +++ b/Makefile.mingw.common @@ -119,19 +119,19 @@ RMDIRREC1 = & cd .. ####### Where is your GTK directory? ifndef GTK -GTK=c:/gtk28 +GTK=c:/gtk210 endif ####### Same thing, DOS style ifndef GTKDOS -GTKDOS=c:\gtk28 +GTKDOS=c:\gtk210 endif ####### Command to process .po files --> .mo MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt ####### change me!! -DTG := 200600801 +DTG := 20070111 endif ########################################################################## @@ -152,7 +152,8 @@ CFLAGS = -Wall -g -O3 -mms-bitfields -DVERSION=$(VERSION) \ ####### Inkboard abilities. ####### You must 'make -f Makefile.mingw clean' when turning this on or off -CFLAGS += -DWITH_INKBOARD -DHAVE_SSL +CFLAGS += -DWITH_INKBOARD -DHAVE_SSL -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" + ####### IMPLICIT RULES .cpp.o: @@ -169,12 +170,12 @@ CFLAGS += -DWITH_INKBOARD -DHAVE_SSL # INCLUDES AND LIBRARIES ########################################################################## -GTKINC = -DGLIBMM_DLL \ --I$(GTK)/include/glibmm-2.4 -I$(GTK)/lib/glibmm-2.4/include \ +GTKINC = -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/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 \ |