slight makefile updates

including a better detection of Windows that doesn't make any assumptions about letter case in environment variable names
devinacker · Nov 22, 2016 · 68e45c3 · 68e45c3
1 parent bee0e36
commit 68e45c3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/bsnes/Makefile b/bsnes/Makefile
@@ -112,7 +112,9 @@ endif
 
 plugins: build
 	@$(MAKE) -C ../snesreader
-#	@$(MAKE) -C ../snesfilter
+ifneq ($(platform), osx)
+	@$(MAKE) -C ../snesfilter
+endif
 	@$(MAKE) -C ../supergameboy
 ifeq ($(platform),osx)
 	mkdir -p $(osxbundle)/Contents/Frameworks

diff --git a/bsnes/nall/Makefile b/bsnes/nall/Makefile
@@ -16,7 +16,7 @@
 
 ifeq ($(platform),)
   uname := $(shell uname -a)
-  ifdef SystemRoot
+  ifeq ($(OS),Windows_NT)
     platform := win
     delete = del $(subst /,\,$1)
   else ifneq ($(findstring Darwin,$(uname)),)

diff --git a/snesfilter/nall/Makefile b/snesfilter/nall/Makefile
@@ -16,7 +16,7 @@
 
 ifeq ($(platform),)
   uname := $(shell uname -a)
-  ifdef SystemRoot
+  ifeq ($(OS),Windows_NT)
     platform := win
     delete = del $(subst /,\,$1)
   else ifneq ($(findstring Darwin,$(uname)),)

diff --git a/snesreader/nall/Makefile b/snesreader/nall/Makefile
@@ -16,7 +16,7 @@
 
 ifeq ($(platform),)
   uname := $(shell uname -a)
-  ifdef SystemRoot
+  ifeq ($(OS),Windows_NT)
     platform := win
     delete = del $(subst /,\,$1)
   else ifneq ($(findstring Darwin,$(uname)),)

diff --git a/supergameboy/nall/Makefile b/supergameboy/nall/Makefile
@@ -16,7 +16,7 @@
 
 ifeq ($(platform),)
   uname := $(shell uname -a)
-  ifdef SystemRoot
+  ifeq ($(OS),Windows_NT)
     platform := win
     delete = del $(subst /,\,$1)
   else ifneq ($(findstring Darwin,$(uname)),)