Skip to content

Commit 72a26ed

Browse files
committed
update
1 parent 350a7fa commit 72a26ed

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

gdal.pri

+8-17
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@
44
# How to compile on windows:
55
#
66
# win32-msvc (Microsoft Visual C)
7-
# - install GDAL (32 or 64 bit) from OSGeo4W https://trac.osgeo.org/osgeo4w/
8-
# - add GDAL_PATH to the system variables - example: GDAL_PATH = C:\OSGeo4W64
9-
# - add GDAL_DATA to the system variables - example: GDAL_DATA = C:\OSGeo4W64\share\epsg_csv
10-
# - add PROJ_LIB to the system variables - example: PROJ_LIB = C:\OSGeo4W64\share\proj
7+
# - install GDAL from OSGeo4W https://trac.osgeo.org/osgeo4w/
8+
# - add GDAL_PATH to the system variables - example: GDAL_PATH = C:\OSGeo4W
9+
# - add GDAL_DATA to the system variables - example: GDAL_DATA = C:\OSGeo4W\share\epsg_csv
10+
# - add PROJ_LIB to the system variables - example: PROJ_LIB = C:\OSGeo4W\share\proj
1111
# - add OSGeo4W\bin to the system path
1212
#
13-
# win32-g++ (MinGW)
14-
# Unfortunately it doesn't seem to work at the moment
15-
# - install and update MSYS2 from https://www.msys2.org/
16-
# - run MSYS2 shell and install GDAL package - example: pacman -S mingw-w64-x86_64-gdal
17-
# - add MSYS_PATH to system variables - example: MSYS_PATH = C:\msys64\mingw64
18-
# - add msys\mingw\bin to the system path
19-
#
2013
#------------------------------------------------------------------------------------------
2114

2215
unix:!macx {
@@ -28,21 +21,19 @@ unix:!macx {
2821
}
2922

3023
win32-msvc {
31-
LIBS += -L$$(GDAL_PATH)/lib/ -lgdal_i -lgeos_c
24+
LIBS += -L$$(GDAL_PATH)/lib/ -lgdal_i
3225

3326
INCLUDEPATH += $$(GDAL_PATH)/include
3427
DEPENDPATH += $$(GDAL_PATH)/include
3528
}
3629

3730
win32-g++ {
38-
LIBS += -L$$(MSYS_PATH)/lib/ -lgdal -lgeos -lgeos_c
31+
LIBS += -L$$(GDAL_PATH)/lib/ -lgdal
3932

40-
INCLUDEPATH += $$(MSYS_PATH)/include
41-
DEPENDPATH += $$(MSYS_PATH)/include
33+
INCLUDEPATH += $$(GDAL_PATH)/include
34+
DEPENDPATH += $$(GDAL_PATH)/include
4235

4336
PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgdal.a
44-
PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgeos.dll.a
45-
PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgeos_c.dll.a
4637
}
4738

4839
mac {

gdalHandler/gdalHandler.pro

-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ SOURCES += \
3434
gdalExtensions.cpp \
3535
gdalRasterFunctions.cpp \
3636
gdalShapeFunctions.cpp \
37-
# gdalShapeIntersection.cpp
3837

3938
HEADERS += \
4039
gdalExtensions.h \
4140
gdalRasterFunctions.h \
4241
gdalShapeFunctions.h \
43-
# gdalShapeIntersection.h
4442

4543

4644
include(../gdal.pri)

0 commit comments

Comments
 (0)