diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74d0d93 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.so +*.o +*.json +*.txt +*.a \ No newline at end of file diff --git a/Makefile b/Makefile index f895a4b..796ea78 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,13 @@ ## Last update Wed Aug 26 12:42:01 2015 Guillaume ROBIN ## -CC = g++ -g3 +CC = clang++ RM = rm -f NAME = LoveBrains -CXXFLAGS += -Werror -Wall -Wextra -pthread -std=c++11 +CXXFLAGS += -Werror -Wall -Wextra -std=c++11 CXXFLAGS += -I ./include/ diff --git a/api/lib/ANNLibrary/Makefile b/api/lib/ANNLibrary/Makefile index 781263e..851ce0f 100644 --- a/api/lib/ANNLibrary/Makefile +++ b/api/lib/ANNLibrary/Makefile @@ -8,7 +8,7 @@ ## Last update Tue Aug 25 17:22:35 2015 Guillaume ROBIN ## -CC = g++ +CC = clang++ RM = rm -f @@ -18,7 +18,7 @@ CXXFLAGS += -Werror -Wextra -Wall -std=c++11 CXXFLAGS += -I ./include -LDFLAGS = -lm +LDFLAGS = SRCS += src/ANN/ann_layer.cc \ src/ANN/ann_exception.cc \ diff --git a/lib/GANNEngine/Makefile b/lib/GANNEngine/Makefile index 9d4a3b3..79bdd0f 100644 --- a/lib/GANNEngine/Makefile +++ b/lib/GANNEngine/Makefile @@ -8,7 +8,7 @@ ## Last update Tue Aug 25 16:57:02 2015 Guillaume ROBIN ## -CC = g++ +CC = clang++ RM = rm -f @@ -18,7 +18,7 @@ CXXFLAGS += -Werror -Wextra -Wall -pthread -std=c++11 CXXFLAGS += -I ./include -LDFLAGS = -lm +LDFLAGS = SRCS += src/ANN/ann_layer.cc \ src/ANN/neural_net.cc \ diff --git a/mods/basic_survival/Makefile b/mods/basic_survival/Makefile index 43085a9..182c7ea 100644 --- a/mods/basic_survival/Makefile +++ b/mods/basic_survival/Makefile @@ -8,7 +8,7 @@ ## Last update Sat Nov 28 13:55:55 2015 Guillaume ROBIN ## -CC = g++ +CC = clang++ RM = rm -f @@ -18,7 +18,7 @@ CXXFLAGS += -std=c++11 CXXFLAGS += -I ./include/ -I ./api/include/ -I ./api/lib/ANNLibrary/include/ -LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system -lm -lANN -L./api/lib/ANNLibrary/ +LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system -lANN -L ./api/lib/ANNLibrary/ # Add sources below. SRCS += src/plugin.cc \ @@ -45,10 +45,10 @@ flib: make fclean -C ./api/lib/ANNLibrary/ %.o: %.cc - $(CC) -fPIC $(CXXFLAGS) -c $< $(LDFLAGS) -o $@ + $(CC) -fPIC $(CXXFLAGS) -c $< -o $@ $(NAME): $(OBJS) - $(CC) -shared $(CXXFLAGS) $(OBJS) -o $(NAME) -Wl,--whole-archive -lANN -L./api/lib/ANNLibrary -Wl,--no-whole-archive + $(CC) -shared $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $(NAME) clean: clib $(RM) $(OBJS) diff --git a/mods/basic_survival/api/lib/ANNLibrary/Makefile b/mods/basic_survival/api/lib/ANNLibrary/Makefile index 781263e..851ce0f 100644 --- a/mods/basic_survival/api/lib/ANNLibrary/Makefile +++ b/mods/basic_survival/api/lib/ANNLibrary/Makefile @@ -8,7 +8,7 @@ ## Last update Tue Aug 25 17:22:35 2015 Guillaume ROBIN ## -CC = g++ +CC = clang++ RM = rm -f @@ -18,7 +18,7 @@ CXXFLAGS += -Werror -Wextra -Wall -std=c++11 CXXFLAGS += -I ./include -LDFLAGS = -lm +LDFLAGS = SRCS += src/ANN/ann_layer.cc \ src/ANN/ann_exception.cc \ diff --git a/mods/basic_survival/src/math.cc b/mods/basic_survival/src/math.cc index 6770012..448131c 100644 --- a/mods/basic_survival/src/math.cc +++ b/mods/basic_survival/src/math.cc @@ -8,8 +8,7 @@ // Last update Tue Aug 18 13:38:31 2015 Guillaume ROBIN // -// #include - +#include #include "math_plugin.h" /*