Skip to content
This repository has been archived by the owner on Dec 5, 2018. It is now read-only.

Commit

Permalink
Adding .
Browse files Browse the repository at this point in the history
  • Loading branch information
cesumilo committed Dec 8, 2015
1 parent f7ba45d commit bd11dcc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.so
*.o
*.json
*.txt
*.a
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
4 changes: 2 additions & 2 deletions api/lib/ANNLibrary/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Last update Tue Aug 25 17:22:35 2015 Guillaume ROBIN
##

CC = g++
CC = clang++

RM = rm -f

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions lib/GANNEngine/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Last update Tue Aug 25 16:57:02 2015 Guillaume ROBIN
##

CC = g++
CC = clang++

RM = rm -f

Expand All @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions mods/basic_survival/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Last update Sat Nov 28 13:55:55 2015 Guillaume ROBIN
##

CC = g++
CC = clang++

RM = rm -f

Expand All @@ -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 \
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions mods/basic_survival/api/lib/ANNLibrary/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Last update Tue Aug 25 17:22:35 2015 Guillaume ROBIN
##

CC = g++
CC = clang++

RM = rm -f

Expand All @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions mods/basic_survival/src/math.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
// Last update Tue Aug 18 13:38:31 2015 Guillaume ROBIN
//

// #include <cmath>

#include <cmath>
#include "math_plugin.h"

/*
Expand Down

0 comments on commit bd11dcc

Please sign in to comment.