Browse Source

Review Makefile to support PLATFORM_RPI #1580

raysan5 4 years ago
parent
commit
043eb5882b

+ 4 - 7
examples/Makefile

@@ -177,15 +177,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     CC = emcc
     CC = emcc
 endif
 endif
 
 
-# Define default make program: Mingw32-make
-MAKE = mingw32-make
+# Define default make program
+MAKE = make
 
 
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(PLATFORM_OS),LINUX)
-        MAKE = make
-    endif
-    ifeq ($(PLATFORM_OS),OSX)
-        MAKE = make
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        MAKE = mingw32-make
     endif
     endif
 endif
 endif
 
 

+ 4 - 7
templates/advance_game/Makefile

@@ -177,15 +177,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     CC = emcc
     CC = emcc
 endif
 endif
 
 
-# Define default make program: Mingw32-make
-MAKE = mingw32-make
+# Define default make program
+MAKE = make
 
 
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(PLATFORM_OS),LINUX)
-        MAKE = make
-    endif
-    ifeq ($(PLATFORM_OS),OSX)
-        MAKE = make
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        MAKE = mingw32-make
     endif
     endif
 endif
 endif
 
 

+ 4 - 9
templates/simple_game/Makefile

@@ -186,15 +186,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     CC = emcc
     CC = emcc
 endif
 endif
 
 
-# Define default make program: Mingw32-make
-MAKE = mingw32-make
+# Define default make program
+MAKE = make
 
 
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(PLATFORM_OS),LINUX)
-        MAKE = make
-    endif
-    ifeq ($(PLATFORM_OS),OSX)
-        MAKE = make
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        MAKE = mingw32-make
     endif
     endif
 endif
 endif
 
 
@@ -399,11 +396,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
     MAKEFILE_PARAMS = -f Makefile.Android 
     MAKEFILE_PARAMS = -f Makefile.Android 
     # For Linux and macOS set make and makefile
     # For Linux and macOS set make and makefile
     ifeq ($(PLATFORM_OS),LINUX)
     ifeq ($(PLATFORM_OS),LINUX)
-        MAKE = make
         MAKEFILE_PARAMS = -f Makefile.Android.linux
         MAKEFILE_PARAMS = -f Makefile.Android.linux
     endif
     endif
     ifeq ($(PLATFORM_OS),OSX)
     ifeq ($(PLATFORM_OS),OSX)
-        MAKE = make
         MAKEFILE_PARAMS = -f Makefile.Android.macos
         MAKEFILE_PARAMS = -f Makefile.Android.macos
     endif
     endif
     export PROJECT_NAME
     export PROJECT_NAME

+ 4 - 7
templates/standard_game/Makefile

@@ -177,15 +177,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     CC = emcc
     CC = emcc
 endif
 endif
 
 
-# Define default make program: Mingw32-make
-MAKE = mingw32-make
+# Define default make program
+MAKE = make
 
 
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(PLATFORM_OS),LINUX)
-        MAKE = make
-    endif
-    ifeq ($(PLATFORM_OS),OSX)
-        MAKE = make
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        MAKE = mingw32-make
     endif
     endif
 endif
 endif