Skip to content

Commit

Permalink
maybe try unifying makevars
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Jun 6, 2024
1 parent 3aa9832 commit 7f89dff
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 155 deletions.
139 changes: 0 additions & 139 deletions src/Makevars.ucrt

This file was deleted.

32 changes: 16 additions & 16 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
OPENSSL_LIBS = $(shell pkg-config --libs openssl)

# Config for legacy rtools without pkgconfig
ifeq (,$(OPENSSL_LIBS))
OPENSSL_LIBS=-L../windows/openssl-$(VERSION)/lib${R_ARCH}${CRT} -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32
OPENSSL_CFLAGS=-I../windows/openssl-$(VERSION)/include
ABSL_LIBS = -labsl_cord -labsl_cordz_info -labsl_cord_internal -labsl_cordz_functions -labsl_cordz_handle -labsl_crc_cord_state -labsl_crc32c -labsl_crc_internal -labsl_crc_cpu_detect -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_exponential_biased -labsl_synchronization -labsl_graphcycles_internal -labsl_kernel_timeout_internal -labsl_stacktrace -labsl_symbolize -labsl_malloc_internal -labsl_time -labsl_civil_time -labsl_time_zone -labsl_hash -labsl_city -labsl_bad_optional_access -labsl_bad_variant_access -labsl_low_level_hash -labsl_str_format_internal -labsl_strings -labsl_string_view -labsl_strings_internal -labsl_int128 -labsl_throw_delegate -labsl_demangle_internal -labsl_base -labsl_spinlock_wait -labsl_debugging_internal -labsl_raw_logging_internal -labsl_log_severity

ifeq (,$(shell pkg-config absl_base --libs 2>/dev/null))
ABSL_CFLAGS = -I../tools/dist/include
ABSL_LIB_FLAGS = -L../tools/dist/lib $(ABSL_LIBS) -limagehlp
else
ABSL_LIB_FLAGS = $(ABSL_LIBS)
endif

ifeq (,$(shell pkg-config openssl --libs 2>/dev/null))
PKG_LIBS = -Ls2 -ls2static $(ABSL_LIB_FLAGS) -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
else
PKG_LIBS = -Ls2 -ls2static $(ABSL_LIB_FLAGS) $(shell pkg-config --libs openssl)
endif

VERSION = 1.1.1k
PKG_CPPFLAGS = -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME $(OPENSSL_CFLAGS) -I../src
PKG_LIBS = -Ls2 -ls2static $(OPENSSL_LIBS)
PKG_CPPFLAGS = $(ABSL_CFLAGS) -DSTRICT_R_HEADERS -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../src

CXX_STD = CXX14
CXX_STD = CXX17

STATLIB = s2/libs2static.a

Expand Down Expand Up @@ -125,15 +131,9 @@ $(SHLIB): $(STATLIB)

$(STATLIB): $(S2LIBS)

$(S2LIBS): winlibs

#all: clean

winlibs:
mkdir -p ../inst
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)

clean:
rm -f $(SHLIB) $(STATLIB) $(OBJECTS) $(S2LIBS)

.PHONY: all winlibs clean
.PHONY: all clean

0 comments on commit 7f89dff

Please sign in to comment.