Merge branch 'dev' of https://github.com/PolMine/RcppCWB into dev

Author: Andreas Blätte

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppCWB
 Type: Package
 Title: 'Rcpp' Bindings for the 'Corpus Workbench' ('CWB')
-Version: 0.5.2.9003
+Version: 0.5.3
 Date: 2022-05-17
 Author: Andreas Blaette [aut, cre],
   Bernard Desgraupes [aut],

cran-comments.md

@@ -1,9 +1,9 @@
 ## General remarks
 
-This is a "standard" release with some new functionality. No changes to the 
+This is a maintenance release with bug fixes. No changes to the 
 setup of the package.
 
-Previous aspects I repeat here:
+Previous aspects I repeat:
 
 - CRAN package check results report 'GNU make is a SystemRequirements'. Using GNU
 make remains important for the portability of the C code. There would be a great
@@ -18,7 +18,8 @@ change.
 ## Test environments
 
 * CI checks with GitHub Actions (Windows/macOS/Ubuntu)
-* local macOS R 4.1.3 (arm64)
+* R winbuilder (R 4.2 release and devel)
+* local macOS, still R 4.1.3 (arm64)
 
 
 ## R CMD check results

src/Makevars.ucrt

@@ -3,7 +3,7 @@ R_PACKAGE_SOURCE=$(CURDIR)/cwb
 GLIB_DEFINES=-I$(R_TOOLS_SOFT)/include/glib-2.0 \
              -I$(R_TOOLS_SOFT)/lib/glib-2.0/include
 
-PKG_CPPFLAGS=-I$(R_PACKAGE_SOURCE)/cqp -I$(R_PACKAGE_SOURCE)/cl -I$(R_PACKAGE_SOURCE)/CQi -DPCRE_STATIC
+PKG_CPPFLAGS=-I$(R_PACKAGE_SOURCE)/cqp -I$(R_PACKAGE_SOURCE)/cl -I$(R_PACKAGE_SOURCE)/CQi $(GLIB_DEFINES) -DPCRE_STATIC
 
 PKG_LIBS=-L$(R_PACKAGE_SOURCE)/cl -L$(R_PACKAGE_SOURCE)/cqp -L$(R_PACKAGE_SOURCE)/utils -lcwb -lcqp -lcl -lglib-2.0 -lintl -liconv -lws2_32 -lpcre -lole32