uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Updated make scripts to be more compatible with older versions of gmake 3.XX

ugfx_release_2.6
inmarket 2014-09-30 13:33:00 +10:00
parent 417f64bd3c
commit b1b00b1cc9
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx.mk
View File

@ -28,18 +28,25 @@ endif
# Include the operating system define # Include the operating system define
ifeq ($(OPT_OS),win32) ifeq ($(OPT_OS),win32)
GFXDEFS += GFX_USE_OS_WIN32=TRUE GFXDEFS += GFX_USE_OS_WIN32=TRUE
else ifeq ($(OPT_OS),linux) endif
ifeq ($(OPT_OS),linux)
GFXDEFS += GFX_USE_OS_LINUX=TRUE GFXDEFS += GFX_USE_OS_LINUX=TRUE
else ifeq ($(OPT_OS),osx) endif
ifeq ($(OPT_OS),osx)
GFXDEFS += GFX_USE_OS_OSX=TRUE GFXDEFS += GFX_USE_OS_OSX=TRUE
else ifeq ($(OPT_OS),chibios) endif
ifeq ($(OPT_OS),chibios)
GFXDEFS += GFX_USE_OS_CHIBIOS=TRUE GFXDEFS += GFX_USE_OS_CHIBIOS=TRUE
else ifeq ($(OPT_OS),freertos) endif
ifeq ($(OPT_OS),freertos)
GFXDEFS += GFX_USE_OS_FREERTOS=TRUE GFXDEFS += GFX_USE_OS_FREERTOS=TRUE
else ifeq ($(OPT_OS),ecos) endif
ifeq ($(OPT_OS),ecos)
GFXDEFS += GFX_USE_OS_ECOS=TRUE GFXDEFS += GFX_USE_OS_ECOS=TRUE
else ifeq ($(OPT_OS),rawrtos) endif
ifeq ($(OPT_OS),rawrtos)
GFXDEFS += GFX_USE_OS_RAWRTOS=TRUE GFXDEFS += GFX_USE_OS_RAWRTOS=TRUE
else ifeq ($(OPT_OS),raw32) endif
ifeq ($(OPT_OS),raw32)
GFXDEFS += GFX_USE_OS_RAW32=TRUE GFXDEFS += GFX_USE_OS_RAW32=TRUE
endif endif

12
tools/gmake_scripts/compiler_gcc.mk
View File

@ -23,13 +23,17 @@ endif
ifeq ($(BUILDDIR),) ifeq ($(BUILDDIR),)
ifeq ($(MAKECMDGOALS),Debug) ifeq ($(MAKECMDGOALS),Debug)
BUILDDIR = bin/Debug BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),Release) endif
ifeq ($(MAKECMDGOALS),Release)
BUILDDIR = bin/Release BUILDDIR = bin/Release
else ifeq ($(MAKECMDGOALS),cleanDebug) endif
ifeq ($(MAKECMDGOALS),cleanDebug)
BUILDDIR = bin/Debug BUILDDIR = bin/Debug
else ifeq ($(MAKECMDGOALS),cleanRelease) endif
ifeq ($(MAKECMDGOALS),cleanRelease)
BUILDDIR = bin/Release BUILDDIR = bin/Release
else endif
ifeq ($(BUILDDIR),)
BUILDDIR = .build BUILDDIR = .build
endif endif
endif endif