From: Benjamin Auder <benjamin.auder@somewhere>
Date: Fri, 10 Jan 2020 10:30:22 +0000 (+0100)
Subject: Fix Mor thesis link + compiling for Windows
X-Git-Url: https://git.auder.net/doc/html/%7B%7B%20path%28%27fos_user_profile_show%27%29%20%7D%7D?a=commitdiff_plain;h=a51888444d2a3fb4f96d64adb6d564fb1e146d80;p=morpheus.git

Fix Mor thesis link + compiling for Windows
---

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 3216743..bd92ed5 100644
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -5,7 +5,7 @@ Description: Mixture of logistic regressions parameters (H)estimation with
     of binary outputs, and return parameters according to the GLMs mixture model
     (General Linear Model). For more details see chapter 3 in the PhD thesis of
 		Mor-Absa Loum: <http://www.theses.fr/s156435>, available here
-		<https://www.math.u-psud.fr/~loum/IMG/pdf/these.compressed-2.pdf>.
+		<https://tel.archives-ouvertes.fr/tel-01877796/document>.
 Version: 1.0-0
 Author: Benjamin Auder <Benjamin.Auder@u-psud.fr> [aut,cre],
     Mor-Absa Loum <Mor-Absa.Loum@u-psud.fr> [aut]
diff --git a/pkg/src/Makevars b/pkg/src/Makevars
index 79f50e9..6a52f60 100644
--- a/pkg/src/Makevars
+++ b/pkg/src/Makevars
@@ -1,9 +1,4 @@
 # Override R weird defaults:
 # https://stackoverflow.com/questions/23414448/r-makevars-file-to-overwrite-r-cmds-default-g-options
-
 %.o: %.c
-	gcc -I/usr/include/R -I/usr/local/include/R -DNDEBUG -fpic -O2 -c $< -o $@
-
-# On u-psud cluster:
-#%.o: %.c
-#	gcc -I"/usr/local/R/3.6.1/lib64/R/include" -I/usr/local/include -DNDEBUG -fpic -O2 -c $< -o $@
+	$(CC) -std=c11 -I"$(R_INCLUDE_DIR)" -DNDEBUG -fPIC -O2 -c $< -o $@