Skip to content

Add macOS/Darwin build support and Clang compatibility fixes #2

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

Open
jzmiller1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add macOS/Darwin build support and Clang compatibility fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion demo/1-triangle/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/2-raster/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/2-spheres/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wno-macro-redefined -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/2-stars/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/2-vectors/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/3-gradient/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/3-terrain/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/3-voronoi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/4-crust/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/5-fracture/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
6 changes: 3 additions & 3 deletions demo/5-fracture/_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ int main() {
using density = si::density<float>;
using length = si::length<float>;
using pressure = si::pressure<float>;
using viscosity = si::dynamic_viscosity<float>;
// using viscosity = si::dynamic_viscosity<float>;
using acceleration = si::acceleration<float>;

using vec3 = glm::vec3;
Expand All @@ -134,7 +134,7 @@ int main() {

length world_radius(6.371e6 * si::meter);
density mantle_density(3000.0*si::kilogram/si::meter3);
viscosity mantle_viscosity(1.57e20*si::pascal*si::second);
// viscosity mantle_viscosity(1.57e20*si::pascal*si::second);
int vertices_per_fine_square_side(30);
int vertices_per_coarse_square_side(vertices_per_fine_square_side/2);
dymaxion::Grid<int,int,float> fine(world_radius/meter, vertices_per_fine_square_side);
Expand Down Expand Up @@ -303,7 +303,7 @@ int main() {
}

iterated::Bitset bitset{adapted::BooleanBitset{}};
unlayered::Morphology morphology{bitset};
// unlayered::Morphology morphology{bitset};

adapted::SymbolicOrder suborder;
adapted::SiStrings substrings;
Expand Down
5 changes: 4 additions & 1 deletion demo/6-motion/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/7-openmp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -L$(BREW)/opt/libomp/lib -lglfw -lGLEW -framework OpenGL -lomp

FLAGS-Linux =-fopenmp -march=native -Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-fopenmp -march=native -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-fopenmp -march=native -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Xpreprocessor -fopenmp -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include -I$(BREW)/opt/libomp/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
5 changes: 4 additions & 1 deletion demo/7-profiling/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP=g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)
TEST = $(shell find ./ -type f -name '*_test.*pp')

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -lglfw -lGLEW -framework OpenGL

FLAGS-Linux =-pg -march=native -Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-pg -march=native -Wno-unknown-pragmas -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-pg -march=native -Wno-unknown-pragmas -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-pg -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include

all: $(TEST) ./Makefile
rm -f test.cpp test.out gmon.out && \
Expand Down
6 changes: 5 additions & 1 deletion demo/8-interaction/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@
# Subdirectory makefiles are not bad by themself, but recursive Makefiles are considered harmful!

CPP = g++
OS = $(shell uname -o | sed 's|[^/]*/||')
OS = $(shell uname -s | sed 's/MINGW.*/Msys/' | sed 's/CYGWIN.*/Cygwin/')
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')
BREW = $(shell brew --prefix 2>/dev/null || echo /opt/homebrew)

OUT-Linux = test.out
OUT-Msys = test.exe
OUT-Cygwin = test.exe
OUT-Darwin = test.out

LIBS-Linux =-lglfw -lGL -lGLEW
LIBS-Msys =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Cygwin =-lglfw3 -lopengl32 -lgdi32 -lglew32
LIBS-Darwin =-L$(BREW)/lib -L$(BREW)/opt/libomp/lib -lglfw -lGLEW -framework OpenGL -lomp

FLAGS-Linux =-fopenmp -march=native -Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Msys =-fopenmp -march=native -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Cygwin =-fopenmp -march=native -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS-Darwin =-Xpreprocessor -fopenmp -Wall -Werror -pedantic-errors -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -I$(BREW)/include -I$(BREW)/opt/libomp/include

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
6 changes: 1 addition & 5 deletions inc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ CPP=g++
ROOT = $(shell pwd | sed 's/tectonics.cpp.*/tectonics.cpp/')
TEST = $(shell find ./ -type f -name '*_test.*pp')


# GLM_FORCE_SWIZZLE support swizzling in glm
# GLM_FORCE_PURE disable anonymous structs so we can build with ISO C++
# GLM_ENABLE_EXPERIMENTAL disable anonymous structs so we can build with ISO C++
FLAGS= -Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL
FLAGS= -Wall -Werror -pedantic-errors -rdynamic -g -D GLM_FORCE_SWIZZLE -D GLM_FORCE_PURE -D GLM_ENABLE_EXPERIMENTAL -Wno-deprecated-declarations -Wno-braced-scalar-init -Wno-unused-variable -Wno-vexing-parse -Wno-macro-redefined

all: $(TEST) ./Makefile
rm -f test.cpp && \
Expand Down
2 changes: 1 addition & 1 deletion inc/field/SphericalHarmonics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace field
/*

template<typename T, int Plo, int Phi>
constexpr std::string to_string(const SphericalHarmonic<T,Plo,Phi>& p)
std::string to_string(const SphericalHarmonic<T,Plo,Phi>& p)
{
// const std::string exponents("⁰¹²³⁴⁵⁶⁷⁸⁹");
std::string output;
Expand Down
1 change: 1 addition & 0 deletions inc/field/noise/WorleyNoise_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <index/procedural/noise/glm/UnitVectorNoise.hpp>

#include "MosaicNoise.hpp"
#include "MosaicOps.hpp"
#include "WorleyNoise.hpp"

#include <test/properties.hpp>
Expand Down
2 changes: 1 addition & 1 deletion inc/grid/dymaxion/Point.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace dymaxion
};

template<typename id, typename scalar, glm::qualifier precision>
constexpr std::string to_string(const Point<id,scalar,precision> point)
std::string to_string(const Point<id,scalar,precision> point)
{
return "Point(" + std::to_string(point.square_id) + "," +std::to_string(point.square_position.x) + "," +std::to_string(point.square_position.y) + ")";
}
Expand Down
Loading