Skip to content

Commit

Permalink
Merge pull request #11 from kalibera/update-windows-linking
Browse files Browse the repository at this point in the history
Update linking for Rtools44. Use pkg-config when available.
  • Loading branch information
asgr committed Mar 5, 2024
2 parents fec149f + 903ccdc commit 6586883
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/Makevars.ucrt
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
PKG_CPPFLAGS += -I../inst/include -DSTRICT_R_HEADERS -Dcimg_use_r -DCIMG_COMPILING -Dcimg_use_fftw3_singlethread -Dcimg_use_tiff -Dcimg_use_rng -Dcimg_verbosity=1 -fpermissive -I$(LIB_TIFF)/include -I$(LIB_FFTW)/include
PKG_CXXFLAGS += $(SHLIB_OPENMP_CXXFLAGS)
LIBSHARPYUV = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libsharpyuv.a),-lsharpyuv),)
PKG_LIBS += -L$(LIB_TIFF)/lib -ltiff -ljpeg -lz -lzstd -lwebp $(LIBSHARPYUV) -llzma -L$(LIB_FFTW)/lib -lgdi32 -lfftw3 $(RCPP_LDFLAGS) $(SHLIB_OPENMP_CXXFLAGS)

ifeq (,$(shell pkg-config --version 2>/dev/null))
LIBSHARPYUV = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libsharpyuv.a),-lsharpyuv),)
LIBDEFLATE = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libdeflate.a),-ldeflate),)
LIBLERC = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/liblerc.a),-llerc),)
PKG_LIBS += -L$(LIB_TIFF)/lib -ltiff $(LIBLERC) -ljpeg -lz -lzstd -lwebp $(LIBSHARPYUV) $(LIBDEFLATE) -llzma -L$(LIB_FFTW)/lib -lgdi32 -lfftw3 $(RCPP_LDFLAGS) $(SHLIB_OPENMP_CXXFLAGS)
else
PKG_LIBS = $(shell pkg-config --libs libtiff-4) \
-lgdi32 $(RCPP_LDFLAGS) $(SHLIB_OPENMP_CXXFLAGS)
PKG_CPPFLAGS += $(shell pkg-config --cflags libtiff-4)
endif

0 comments on commit 6586883

Please sign in to comment.