diff --git a/Makefile b/Makefile index 568041b..41d4b3e 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ # Variables ## Compilation CXX = g++ -#CXXFLAGS = -lsfml-graphics -lsfml-window -lsfml-system +CXXFLAGS = -lsfml-graphics -lsfml-window -lsfml-system # Programmes possibles main: bin/main # Éxecutables -bin/main: obj/main.o obj/test.o obj/testClasse.o +bin/main: obj/main.o obj/test.o obj/testClasse.o obj/sfmlTest.o $(CXX) $^ -o $@ $(CXXFLAGS) # Objets diff --git a/src/main.cpp b/src/main.cpp index 49be484..ef75d56 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,10 +2,12 @@ #include "test.hpp" #include "testClasse.hpp" +#include "sfmlTest.hpp" int main() { Geoffrey frogeye; frogeye.setN(42); helloWorld(frogeye.getN()); + sfmlTest(); return 0; } diff --git a/src/sfmlTest.cpp b/src/sfmlTest.cpp index b5cc814..1e913d2 100644 --- a/src/sfmlTest.cpp +++ b/src/sfmlTest.cpp @@ -1,6 +1,8 @@ #include -int main() +#include "sfmlTest.hpp" + +int sfmlTest() { sf::RenderWindow window(sf::VideoMode(200, 200), "SFML works!"); sf::CircleShape shape(100.f); diff --git a/src/sfmlTest.hpp b/src/sfmlTest.hpp new file mode 100644 index 0000000..cad8342 --- /dev/null +++ b/src/sfmlTest.hpp @@ -0,0 +1 @@ +int sfmlTest(); -- libgit2 0.21.2