Skip to content

Commit a12bb9a

Browse files
author
rblazek
committedJan 24, 2006
dll
git-svn-id: http://svn.osgeo.org/qgis/trunk@4735 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d43ba76 commit a12bb9a

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed
 

‎Makefile.win.rules.in

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,28 @@ prefix = @prefix@
66
QT_LDADD = @QT_LDADD@
77

88
GDAL_LDADD = @GDAL_LDADD@
9+
#GDAL_LDADD = -lgdal
910
GEOS_LDADD = @GEOS_LDADD@
1011
GRASS_LIB = @GRASS_LIB@
1112
PROJ_LIB = @PROJ_LIB@
1213

14+
15+
RASTER_A = $(QGTOP)/src/raster/.libs/libqgis_raster.a
16+
COMPOSER_A = $(QGTOP)/src/composer/.libs/libqgis_composer.a
17+
PROJSEL_A = $(QGTOP)/src/widgets/projectionselector/.libs/libqgsprojectionselector.a
18+
CORE_A = $(QGTOP)/src/core/.libs/libqgis_core.a
19+
LEGEND_A = $(QGTOP)/src/legend/.libs/libqgis_legend.a
20+
GUI_A = $(QGTOP)/src/gui/.libs/libqgis_gui.a
21+
22+
RASTER_DLL = -L $(QGTOP)/src/raster/ -lqgis_raster
23+
COMPOSER_DLL = -L $(QGTOP)/src/composer/ -lqgis_composer
24+
PROJSEL_DLL = -L $(QGTOP)/src/widgets/projectionselector/ -lqgis_projsel.dll
25+
CORE_DLL = -L $(QGTOP)/src/core/ -lqgis_core
26+
LEGEND_DLL = -L $(QGTOP)/src/legend/ -lqgis_legend
27+
GUI_DLL = -L $(QGTOP)/src/gui -lqgis_gui
28+
1329
# The order is significant
14-
QGLIBS = $(QGTOP)/src/raster/.libs/libqgis_raster.a \
15-
$(QGTOP)/src/composer/.libs/libqgis_composer.a \
16-
$(QGTOP)/src/widgets/projectionselector/.libs/libqgsprojectionselector.a \
17-
$(QGTOP)/src/core/.libs/libqgis_core.a \
18-
$(QGTOP)/src/legend/.libs/libqgis_legend.a \
19-
$(QGTOP)/src/gui/.libs/libqgis_gui.a
30+
QGLIBS = $(RASTER_A) $(COMPOSER_A) $(PROJSEL_A) $(CORE_A) $(LEGEND_A) $(GUI_A)
2031

2132
# For qgis.exe the QGIS libs must be twice because of circular references
2233
QGIS_LIBS = $(QGLIBS) $(QGLIBS) \

0 commit comments

Comments
 (0)
Please sign in to comment.