Skip to content

Working on MacOS and Linux #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2019
Merged

Working on MacOS and Linux #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24bc1ef
Adding Support for MacOS.
Jun 13, 2019
aab8a82
Making sure it works on MacOS
Jun 13, 2019
1e27b36
Windows Build Files dont work for VsCode CommunityEd atm
Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 0 additions & 108 deletions ImpulseEngine/ImpulseEngine.vcxproj
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions ImpulseEngine/ImpulseEngine.vcxproj.filters
View file
Open in desktop

This file was deleted.

26 changes: 23 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,40 @@
CXXFLAGS=-O3 -std=c++0x -Wall
UNAME_S := $(shell uname -s)

#OpenGL behaves a bit differently on MacOS
OSFLAG =
ifeq ($(OS),Windows_NT)
OSFLAG += -D WIN32
else
ifeq ($(UNAME_S),Darwin)
OSFLAG += -D OSX
endif
endif

CXXFLAGS=-O3 -std=c++0x -Wall $(OSFLAG)

SOURCES= $(wildcard *.cpp)

OBJECTS=$(patsubst %.cpp, %.o, $(SOURCES))

TARGET=$(lastword $(subst /, ,$(realpath .)))

LINKS= -lglut -lGL -lGLU
LINKS =
ifeq ($(UNAME_S),Darwin)
LINKS= -framework OpenGL -framework GLUT
else
LINKS= -lglut -lGL -lGLU
endif

CXX=g++

all: $(TARGET)
@echo ImpulseEngine built

$(TARGET): $(OBJECTS)
@$(CXX) $(CXXFLAGS) -o impulseengine $(OBJECTS) $(LINKS)
$(info OSFLAG is $(OSFLAG))
$(info OBJECTS is $(OBJECTS))
$(CXX) $(CXXFLAGS) $(OSFLAG) -o impulseengine $(OBJECTS) $(LINKS)

clean:
echo $(CCFLAGS)
rm -rf $(OBJECTS) $(TARGET)
5 changes: 5 additions & 0 deletions glut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,13 @@ typedef unsigned short wchar_t;

#endif /* _WIN32 */

#ifdef OSX
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>
#include <GL/glu.h>
#endif

#ifdef __cplusplus
extern "C" {
Expand Down