Skip to content

Commit

Permalink
grass_raster: Remove dynamic loading of GDAL libraries (#2290)
Browse files Browse the repository at this point in the history
Always use standard build-time linking mechanism instead of run-time one. This removes the need to keep adding new versions of libraries for all platforms.  

- Removes GDAL_DYNAMIC.
- Reverts 2650397.
- Fixes #1872.
- Closes #2290.
  • Loading branch information
jef-n committed Apr 20, 2022
1 parent 8ab593f commit adde62e
Show file tree
Hide file tree
Showing 3 changed files with 129 additions and 326 deletions.
9 changes: 0 additions & 9 deletions include/Make/Grass.make
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ MANDIR = $(MANBASEDIR)/man$(MANSECT)
HTML2MAN = VERSION_NUMBER=$(GRASS_VERSION_NUMBER) $(GISBASE)/utils/g.html2man.py

GDAL_LINK = $(USE_GDAL)
GDAL_DYNAMIC = 1

DEPFILE = depend.mk

Expand Down Expand Up @@ -235,16 +234,8 @@ DISPLAYDEPS += $(CAIRODRIVERLIB)
endif

ifneq ($(GDAL_LINK),)
ifneq ($(GDAL_DYNAMIC),)
ifneq ($(MINGW),)
RASTERDEPS += -lkernel32
else
RASTERDEPS += $(DLLIB)
endif
else
RASTERDEPS += $(GDALLIBS)
endif
endif

ifeq ($(OPENGL_WINDOWS),1)
NVIZDEPS += -lgdi32
Expand Down
5 changes: 0 additions & 5 deletions lib/raster/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ include $(MODULE_TOPDIR)/include/Make/Doxygen.make
ifneq ($(GDAL_LINK),)
EXTRA_CFLAGS += -DGDAL_LINK=1
EXTRA_INC += $(PROJINC) $(GDALCFLAGS)

ifneq ($(GDAL_DYNAMIC),)
EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
endif

endif

default: lib
Expand Down

0 comments on commit adde62e

Please sign in to comment.