Compiler fix

bazz1tv · Jul 25, 2020 · b2af9ae · b2af9ae
1 parent 76529fa
commit b2af9ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pc/Makefile b/pc/Makefile
@@ -23,9 +23,16 @@ SHARED_DIR = shared/
 PROJ_DIR = ext
 #
 
-CC ?= $(CROSS_COMPILE)g++
-CPP ?= $(CROSS_COMPILE)g++
+# Only Set compilers if they are unset (default). This lets you set them from the environment manually.
+ifeq ($(origin CC),default)
+	CC = $(CROSS_COMPILE)g++
+endif
+ifeq ($(origin CPP),default)
+	CPP = $(CROSS_COMPILE)g++
+endif
+# OBJCC is not a Make default variable so use this syntax instead
 OBJCC ?= $(CROSS_COMPILE)g++
+
 debug = -g
 optimize = -O3
 

diff --git a/submodules/libgme_m b/submodules/libgme_m