Merge pull request #57 from waywardmonkeys/use-macos-name

Refer to macOS rather than osx/Mac OS X.
This commit is contained in:
Victor Bombi
2018-10-04 12:22:36 +02:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
#
# Cross Platform Makefile
# Compatible with Ubuntu 14.04.1 and Mac OS X
# Compatible with Ubuntu 14.04.1 and macOS
OBJS = cimgui_auto.o
OBJS += ./imgui/imgui.o
@@ -21,7 +21,7 @@ ifeq ($(UNAME_S), Linux) #LINUX
endif
ifeq ($(UNAME_S), Darwin) #APPLE
ECHO_MESSAGE = "Mac OS X"
ECHO_MESSAGE = "macOS"
OUTPUTNAME = cimgui.dylib
CXXFLAGS = -I/usr/local/include

View File

@@ -14,7 +14,7 @@ Notes:
# compilation
* clone
* make using makefile on linux/osx/mingw (Or use CMake to generate project)
* make using makefile on linux/macOS/mingw (Or use CMake to generate project)
# auto binding generation