makefile and .gitignore updates for os x
This commit is contained in:
parent
b5b9558432
commit
e6b0de1f19
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
||||||
|
.DS_Store
|
||||||
*.sdf
|
*.sdf
|
||||||
*.opensdf
|
*.opensdf
|
||||||
*.user
|
*.user
|
||||||
|
|
13
Makefile
13
Makefile
|
@ -31,18 +31,21 @@ $(info $(CFG) configuration selected)
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
# default windows libraries and options
|
# default windows libraries and options
|
||||||
PLATFORM := win32
|
PLATFORM := win32
|
||||||
PLATFORM_LD_FLAGS := -static-libgcc -static-libstdc++
|
PLATFORM_LD_FLAGS := -static-libgcc -static-libstdc++
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
ifeq ($(UNAME), Linux)
|
ifeq ($(UNAME), Linux)
|
||||||
# it appears that we're running on linux
|
|
||||||
PLATFORM := linux
|
PLATFORM := linux
|
||||||
PLATFORM_LD_FLAGS :=
|
PLATFORM_LD_FLAGS :=
|
||||||
endif
|
endif
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
# TODO: other platform detection
|
ifeq ($(UNAME), Darwin)
|
||||||
|
PLATFORM := osx
|
||||||
|
PLATFORM_LD_FLAGS :=
|
||||||
|
endif
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
Reference in a new issue