Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ftomei committed Aug 12, 2024
1 parent 350a7fa commit 72a26ed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
25 changes: 8 additions & 17 deletions gdal.pri
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
# How to compile on windows:
#
# win32-msvc (Microsoft Visual C)
# - install GDAL (32 or 64 bit) from OSGeo4W https://trac.osgeo.org/osgeo4w/
# - add GDAL_PATH to the system variables - example: GDAL_PATH = C:\OSGeo4W64
# - add GDAL_DATA to the system variables - example: GDAL_DATA = C:\OSGeo4W64\share\epsg_csv
# - add PROJ_LIB to the system variables - example: PROJ_LIB = C:\OSGeo4W64\share\proj
# - install GDAL from OSGeo4W https://trac.osgeo.org/osgeo4w/
# - add GDAL_PATH to the system variables - example: GDAL_PATH = C:\OSGeo4W
# - add GDAL_DATA to the system variables - example: GDAL_DATA = C:\OSGeo4W\share\epsg_csv
# - add PROJ_LIB to the system variables - example: PROJ_LIB = C:\OSGeo4W\share\proj
# - add OSGeo4W\bin to the system path
#
# win32-g++ (MinGW)
# Unfortunately it doesn't seem to work at the moment
# - install and update MSYS2 from https://www.msys2.org/
# - run MSYS2 shell and install GDAL package - example: pacman -S mingw-w64-x86_64-gdal
# - add MSYS_PATH to system variables - example: MSYS_PATH = C:\msys64\mingw64
# - add msys\mingw\bin to the system path
#
#------------------------------------------------------------------------------------------

unix:!macx {
Expand All @@ -28,21 +21,19 @@ unix:!macx {
}

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

INCLUDEPATH += $$(GDAL_PATH)/include
DEPENDPATH += $$(GDAL_PATH)/include
}

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

INCLUDEPATH += $$(MSYS_PATH)/include
DEPENDPATH += $$(MSYS_PATH)/include
INCLUDEPATH += $$(GDAL_PATH)/include
DEPENDPATH += $$(GDAL_PATH)/include

PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgdal.a
PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgeos.dll.a
PRE_TARGETDEPS += $$(MSYS_PATH)/lib/libgeos_c.dll.a
}

mac {
Expand Down
2 changes: 0 additions & 2 deletions gdalHandler/gdalHandler.pro
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ SOURCES += \
gdalExtensions.cpp \
gdalRasterFunctions.cpp \
gdalShapeFunctions.cpp \
# gdalShapeIntersection.cpp

HEADERS += \
gdalExtensions.h \
gdalRasterFunctions.h \
gdalShapeFunctions.h \
# gdalShapeIntersection.h


include(../gdal.pri)

0 comments on commit 72a26ed

Please sign in to comment.