** Fixed GRASS plugin and provider build

git-svn-id: http://svn.osgeo.org/qgis/trunk@1130 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jobi 2004-04-01 12:23:06 +00:00
parent fc530d304b
commit 88f600f163
5 changed files with 123 additions and 7 deletions

View File

@ -1,8 +1,11 @@
QGIS Change Log
ChangeLog,v 1.44 2004/03/31 22:06:51 jobi Exp
ChangeLog,v 1.45 2004/04/01 12:23:05 jobi Exp
------------------------------------------------------------------------------
Version 0.2 'Pumpkin' .... development version
2004-04-01 [jobi] 0.1.0devel22
** Fixed GRASS plugin and provider build
2004-04-01 [jobi] 0.1.0devel21
** fixed strange warning: object 'foo.$(OBJEXT)' created both
with libtool and without

View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
dnl configure.in,v 1.44 2004/03/31 22:06:51 jobi Exp
dnl configure.in,v 1.45 2004/04/01 12:23:05 jobi Exp
AC_INIT
@ -23,7 +23,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=1
MICRO_VERSION=0
EXTRA_VERSION=21
EXTRA_VERSION=22
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else

View File

@ -26,12 +26,13 @@ plugin_LTLIBRARIES = grassplugin.la
grassplugin_la_SOURCES = qgsgrassplugin.cpp \
qgsgrassplugin.h \
qgsgrassselect.cpp \
qgsgrassselect.h \
qgsgrassselect.h \
../../providers/grass/qgsgrass.cpp \
../../providers/grass/qgsgrass.h \
$(plugin_UI)\
$(plugin_MOC)
$(plugin_MOC) \
../../src/qgssymbol.cpp
plugin_MOC = qgsgrassplugin.moc.cpp \
qgsgrassselectbase.moc.cpp

View File

@ -0,0 +1,112 @@
/* XPM */
static const char *icon_add_vector[] = {
/* columns rows colors chars-per-pixel */
"22 22 84 1",
" c #00000040",
". c #03060a40",
"X c #06121f00",
"o c #0d151d00",
"O c #141e2800",
"+ c #0a293e00",
"@ c #262b3200",
"# c #2e333a00",
"$ c #0b3b54dc",
"% c #133348dc",
"& c #0f5a7ddc",
"* c #3b5160dc",
"= c #4c5258dc",
"- c #565656dc",
"; c #5a5a5adc",
": c #525a61dc",
"> c #5b6368dc",
", c #65696ddc",
"< c #6e7276dc",
"1 c #777777dc",
"2 c #13688cdc",
"3 c #106e93dc",
"4 c #157296dc",
"5 c #197397dc",
"6 c #1e7699dc",
"7 c #107ea6dc",
"8 c #217294dc",
"9 c #6d7f8ddc",
"0 c #7a7c80dc",
"q c #00c000dc",
"w c #0f8eb600",
"e c #0e96be00",
"r c #138fb700",
"t c #1397be00",
"y c #1799bf00",
"u c #3685a300",
"i c #3b88a500",
"p c #27a0c300",
"a c #2ca2c400",
"s c #4588a500",
"d c #4c8faa00",
"f c #4380b500",
"g c #578da600",
"h c #5e9ab200",
"j c #629ab200",
"k c #41abca00",
"l c #4dafcc00",
"z c #56b4d000",
"x c #5eb7d200",
"c c #6cbdd400",
"v c #73bed400",
"b c #76c0d600",
"n c #79c2d600",
"m c #c0000000",
"M c #83838300",
"N c #83949c00",
"B c #92959a00",
"V c #98989800",
"C c #8f98a1ff",
"Z c #86a6b7ff",
"A c #9ca6aeff",
"S c #a5abafff",
"D c #a8bfc9ff",
"F c #82c5d7ff",
"G c #84c6d8ff",
"H c #87c8daff",
"J c #8fcbdcff",
"K c #9ed0e0ff",
"L c #a7c9d5ff",
"P c #b0cad4ff",
"I c #b2ced8ff",
"U c #b5d3dbff",
"Y c #a2d3e1ff",
"T c #aad3e1ff",
"R c #b1d8e4ff",
"E c #b8d5e000",
"W c #badde600",
"Q c #c3d5dd00",
"! c gray84",
"~ c gainsboro",
"^ c #cfe4ecff",
"/ c #f3f3f3ff",
"( c #ffffffff",
") c None",
/* pixels */
"))))))))))))))))))))))",
"))))11111111111111111)",
"))))1((((((((((((((((1",
"))))1(--------------( ",
"))))1(-mmmyyyyyqqmy-( ",
"))))1(OmVmmyyymqqVmX(q",
"))))1(-yyVmmVmmqqyy-qq",
"))))1(-yyommmmVqq6yqq ",
"))))1(-yymqVfmmqq8qq( ",
")))),S9>:,qqy4mqqqq;( ",
"))))<DUEZ=yqqy4qqqm-/ ",
"))))0PWKj#yyqqyqqVV-! ",
"))))BIYGdo@#yqqqqyV-( ",
"))CQQLFnd52%yyqqq;;; -",
"))A^RJvcktw$ymmqq;((VM",
"))NTHJvxzpr$-m6qq;(V-)",
"))*gshlaiu8+(((qq V-))",
")))))6ye4Oo. qq-M)))",
")))))3ee3))))))qq)))))",
")))))&77&))))))qq)))))",
"))))))))))))))))))))))",
"))))))))))))))))))))))"
};

View File

@ -22,4 +22,4 @@ grassprovider_la_SOURCES = qgsgrassprovider.cpp \
grassprovider_la_LIBADD = $(QT_LDADD) $(GRASS_LIB)
grassprovider_la_LDFLAGS = -avoid-version -module
grassprovider_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
grassprovider_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) -I$(PG_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)