From c06428316d1995f5274bce383e0d0418f01c3fdb Mon Sep 17 00:00:00 2001 From: Vincent Lafeychine <vincent.lafeychine@gmail.com> Date: Fri, 11 Feb 2022 12:23:47 +0100 Subject: [PATCH] Add submodule for Non-NixOS users --- .gitmodules | 3 +++ CSFML | 1 + Makefile | 35 +++++++++++++++++++++++++++++++++++ build.sbt | 3 --- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 CSFML create mode 100644 Makefile diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..54e8225 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "CSFML"] + path = CSFML + url = https://github.com/lafeychine/CSFML diff --git a/CSFML b/CSFML new file mode 160000 index 0000000..d4deb5e --- /dev/null +++ b/CSFML @@ -0,0 +1 @@ +Subproject commit d4deb5e3360dafd9f56a569c004a74ff02a56d7d diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9bd0709 --- /dev/null +++ b/Makefile @@ -0,0 +1,35 @@ +CSFML_PATH = CSFML +override CSFML_BUILD := $(CSFML_PATH)/build +override CSFML_LIBRARY := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))$(CSFML_BUILD)/lib + + +NAME = prog-2 + +CP = cp +CMAKE = cmake +MKDIR = mkdir +SBT = sbt + + +all: $(NAME) + +sbt: csfml + SCALANATIVE_LIB_DIRS=$(CSFML_LIBRARY) LD_LIBRARY_PATH=$(CSFML_LIBRARY) $(SBT) $(SBTFLAGS) + +$(NAME): override SBTFLAGS := nativeLink +$(NAME): sbt + $(CP) target/scala-3.1.1/$(NAME)-out $(NAME) + +csfml: $(CSFML_BUILD)/Makefile + $(MAKE) -C $(CSFML_BUILD) + +$(CSFML_BUILD)/Makefile: + $(MKDIR) -p $(CSFML_BUILD) + $(CMAKE) $(CMAKEFLAGS) -B $(CSFML_BUILD) -S $(CSFML_PATH) + +clean: + $(SBT) clean + $(RM) -r $(CSFML_BUILD) + +.NOTPARALLEL: +.PHONY: all clean csfml_lib sbt diff --git a/build.sbt b/build.sbt index b1c15f6..c2b974a 100644 --- a/build.sbt +++ b/build.sbt @@ -3,9 +3,6 @@ scalaVersion := "3.1.1" enablePlugins(ScalaNativePlugin) -nativeCompileOptions ++= Seq("-stdlib=libc++") -nativeLinkingOptions ++= Seq("-fuse-ld=lld") - nativeMode := "debug" nativeLTO := "none" -- GitLab