Эх сурвалжийг харах

Add OSX build for SFML demo

Krzysztof Starzyk 8 жил өмнө
parent
commit
bcd0234ff8

+ 8 - 3
demo/sfml_opengl2/Makefile

@@ -8,7 +8,6 @@ CFLAGS = -s -O2
 SRC = main.cpp
 OBJ = $(SRC:.cpp=.o)
 
-# TODO: Mac Build
 ifeq ($(OS),Windows_NT)
 	# Edit the line below to point to your SFML folder on Windows
 	SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML
@@ -16,10 +15,16 @@ ifeq ($(OS),Windows_NT)
 	BIN := $(BIN).exe
 	LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32
 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
 
-	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
 
 SFML_INC = -I $(SFML_DIR)/include

+ 7 - 3
demo/sfml_opengl3/Makefile

@@ -8,7 +8,6 @@ CFLAGS = -s -O2
 SRC = main.cpp
 OBJ = $(SRC:.cpp=.o)
 
-# TODO: Mac Build
 ifeq ($(OS),Windows_NT)
 	# Edit the line below to point to your SFML/GLAD folder on Windows
 	SFML_DIR = C:/Users/Ricky/MinGW-Libs/SFML
@@ -17,11 +16,16 @@ ifeq ($(OS),Windows_NT)
 	BIN := $(BIN).exe
 	LIBS = -lmingw32 -DSFML_STATIC -lsfml-window-s -lsfml-system-s -lopengl32 -lwinmm -lgdi32
 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
 	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
 
 SFML_INC = -I $(SFML_DIR)/include