vurtun/nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #550 from kstarzyk/add_osx_build_sfml_demo

Browse Source 
Add osx build sfml demo
This commit is contained in:
Micha Mettke 2017-11-14 19:10:43 +01:00 committed by GitHub
commit f436c1a129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demo/sfml_opengl2/Makefile
View File

@ -8,7 +8,6 @@ CFLAGS = -s -O2
SRC = main.cpp SRC = main.cpp
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
# TODO: Mac Build
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Edit the line below to point to your SFML folder on Windows # Edit the line below to point to your SFML folder on Windows
SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML
@ -16,10 +15,15 @@ ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe BIN := $(BIN).exe
LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32 LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32
else else
# Edit the line below to point to your SFML folder on Linux # Edit the line below to point to your SFML folder on Linux/MacOS
SFML_DIR = /home/ricky/Libraries/SFML SFML_DIR = /home/ricky/Libraries/SFML
LIBS = -DSFML_STATIC -lsfml-window-s -lsfml-system-s -pthread -ludev -lGL -lX11 -lXrandr UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
LIBS = -lsfml-window -lsfml-system -pthread -framework OpenGL
else
LIBS = -DSFML_STATIC -lsfml-window-s -lsfml-system-s -pthread -ludev -lGL -lX11 -lXrandr
endif
endif endif
SFML_INC = -I $(SFML_DIR)/include SFML_INC = -I $(SFML_DIR)/include

10
demo/sfml_opengl3/Makefile
View File

@ -8,7 +8,6 @@ CFLAGS = -s -O2
SRC = main.cpp SRC = main.cpp
OBJ = $(SRC:.cpp=.o) OBJ = $(SRC:.cpp=.o)
# TODO: Mac Build
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
# Edit the line below to point to your SFML/GLAD folder on Windows # Edit the line below to point to your SFML/GLAD folder on Windows
SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML
@ -17,11 +16,16 @@ ifeq ($(OS),Windows_NT)
BIN := $(BIN).exe BIN := $(BIN).exe
LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32 LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32
else else
# Edit the line below to point to your SFML/GLAD folder on Linux # Edit the line below to point to your SFML/GLAD folder on Linux/MacOS
SFML_DIR = /home/ricky/Libraries/SFML SFML_DIR = /home/ricky/Libraries/SFML
GLAD_DIR = /home/ricky/Libraries/GLAD GLAD_DIR = /home/ricky/Libraries/GLAD
LIBS = -DSFML_STATIC -lsfml-window-s -lsfml-system-s -pthread -ludev -lGL -lX11 -lXrandr UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
LIBS = -lsfml-window -lsfml-system -pthread -framework OpenGL
else
LIBS = -DSFML_STATIC -lsfml-window-s -lsfml-system-s -pthread -ludev -lGL -lX11 -lXrandr
endif
endif endif
SFML_INC = -I $(SFML_DIR)/include SFML_INC = -I $(SFML_DIR)/include