diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-09-30 13:33:00 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-09-30 13:33:00 +1000 |
| commit | 8cc07f2d4c513ed7bd9d0d9a825102555038c715 (patch) | |
| tree | 578b85fbd7ca66510aed164c011d4601511d5098 | |
| parent | ac6e26f1a0a299152dadb61171127322033bdd8b (diff) | |
| download | uGFX-8cc07f2d4c513ed7bd9d0d9a825102555038c715.tar.gz uGFX-8cc07f2d4c513ed7bd9d0d9a825102555038c715.tar.bz2 uGFX-8cc07f2d4c513ed7bd9d0d9a825102555038c715.zip | |
Updated make scripts to be more compatible with older versions of gmake 3.XX
| -rw-r--r-- | gfx.mk | 21 | ||||
| -rw-r--r-- | tools/gmake_scripts/compiler_gcc.mk | 12 |
2 files changed, 22 insertions, 11 deletions
@@ -28,18 +28,25 @@ endif # Include the operating system define
ifeq ($(OPT_OS),win32)
GFXDEFS += GFX_USE_OS_WIN32=TRUE
-else ifeq ($(OPT_OS),linux)
+endif
+ifeq ($(OPT_OS),linux)
GFXDEFS += GFX_USE_OS_LINUX=TRUE
-else ifeq ($(OPT_OS),osx)
+endif
+ifeq ($(OPT_OS),osx)
GFXDEFS += GFX_USE_OS_OSX=TRUE
-else ifeq ($(OPT_OS),chibios)
+endif
+ifeq ($(OPT_OS),chibios)
GFXDEFS += GFX_USE_OS_CHIBIOS=TRUE
-else ifeq ($(OPT_OS),freertos)
+endif
+ifeq ($(OPT_OS),freertos)
GFXDEFS += GFX_USE_OS_FREERTOS=TRUE
-else ifeq ($(OPT_OS),ecos)
+endif
+ifeq ($(OPT_OS),ecos)
GFXDEFS += GFX_USE_OS_ECOS=TRUE
-else ifeq ($(OPT_OS),rawrtos)
+endif
+ifeq ($(OPT_OS),rawrtos)
GFXDEFS += GFX_USE_OS_RAWRTOS=TRUE
-else ifeq ($(OPT_OS),raw32)
+endif
+ifeq ($(OPT_OS),raw32)
GFXDEFS += GFX_USE_OS_RAW32=TRUE
endif
diff --git a/tools/gmake_scripts/compiler_gcc.mk b/tools/gmake_scripts/compiler_gcc.mk index eed78e82..0e5b8098 100644 --- a/tools/gmake_scripts/compiler_gcc.mk +++ b/tools/gmake_scripts/compiler_gcc.mk @@ -23,13 +23,17 @@ endif ifeq ($(BUILDDIR),) ifeq ($(MAKECMDGOALS),Debug) BUILDDIR = bin/Debug - else ifeq ($(MAKECMDGOALS),Release) + endif + ifeq ($(MAKECMDGOALS),Release) BUILDDIR = bin/Release - else ifeq ($(MAKECMDGOALS),cleanDebug) + endif + ifeq ($(MAKECMDGOALS),cleanDebug) BUILDDIR = bin/Debug - else ifeq ($(MAKECMDGOALS),cleanRelease) + endif + ifeq ($(MAKECMDGOALS),cleanRelease) BUILDDIR = bin/Release - else + endif + ifeq ($(BUILDDIR),) BUILDDIR = .build endif endif |