Reprise du script compil.sh. Il permet maintenant d'utiliser CMake (apt-get install cmake au préalable) et de compiler les binaires dans le dossier bin( ou ili y a un gros svn:ignore * pour qu'on commite pas par erreur des binaires ou fichiers générés.

git-svn-id: file:///var/svn/2010-netlemmings/trunk@128 077b3477-7977-48bd-8428-443f22f7bfda

10 files changed, 14 insertions, 309 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 823645f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,294 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/lpouzenc/Bureau/lemmings/src
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/lpouzenc/Bureau/lemmings
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/lpouzenc/Bureau/lemmings/CMakeFiles /home/lpouzenc/Bureau/lemmings/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/lpouzenc/Bureau/lemmings/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named netlem
-
-# Build rule for target.
-netlem: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 netlem
-.PHONY : netlem
-
-# fast build rule for target.
-netlem/fast:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/build
-.PHONY : netlem/fast
-
-#=============================================================================
-# Target rules for targets named netlem_ds
-
-# Build rule for target.
-netlem_ds: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 netlem_ds
-.PHONY : netlem_ds
-
-# fast build rule for target.
-netlem_ds/fast:
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/build
-.PHONY : netlem_ds/fast
-
-events.o: events.c.o
-.PHONY : events.o
-
-# target to build an object file
-events.c.o:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/events.c.o
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/events.c.o
-.PHONY : events.c.o
-
-events.i: events.c.i
-.PHONY : events.i
-
-# target to preprocess a source file
-events.c.i:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/events.c.i
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/events.c.i
-.PHONY : events.c.i
-
-events.s: events.c.s
-.PHONY : events.s
-
-# target to generate assembly for a file
-events.c.s:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/events.c.s
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/events.c.s
-.PHONY : events.c.s
-
-game.o: game.c.o
-.PHONY : game.o
-
-# target to build an object file
-game.c.o:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/game.c.o
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/game.c.o
-.PHONY : game.c.o
-
-game.i: game.c.i
-.PHONY : game.i
-
-# target to preprocess a source file
-game.c.i:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/game.c.i
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/game.c.i
-.PHONY : game.c.i
-
-game.s: game.c.s
-.PHONY : game.s
-
-# target to generate assembly for a file
-game.c.s:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/game.c.s
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/game.c.s
-.PHONY : game.c.s
-
-netlem.o: netlem.c.o
-.PHONY : netlem.o
-
-# target to build an object file
-netlem.c.o:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/netlem.c.o
-.PHONY : netlem.c.o
-
-netlem.i: netlem.c.i
-.PHONY : netlem.i
-
-# target to preprocess a source file
-netlem.c.i:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/netlem.c.i
-.PHONY : netlem.c.i
-
-netlem.s: netlem.c.s
-.PHONY : netlem.s
-
-# target to generate assembly for a file
-netlem.c.s:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/netlem.c.s
-.PHONY : netlem.c.s
-
-netlem_ds.o: netlem_ds.c.o
-.PHONY : netlem_ds.o
-
-# target to build an object file
-netlem_ds.c.o:
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/netlem_ds.c.o
-.PHONY : netlem_ds.c.o
-
-netlem_ds.i: netlem_ds.c.i
-.PHONY : netlem_ds.i
-
-# target to preprocess a source file
-netlem_ds.c.i:
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/netlem_ds.c.i
-.PHONY : netlem_ds.c.i
-
-netlem_ds.s: netlem_ds.c.s
-.PHONY : netlem_ds.s
-
-# target to generate assembly for a file
-netlem_ds.c.s:
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/netlem_ds.c.s
-.PHONY : netlem_ds.c.s
-
-utils.o: utils.c.o
-.PHONY : utils.o
-
-# target to build an object file
-utils.c.o:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/utils.c.o
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/utils.c.o
-.PHONY : utils.c.o
-
-utils.i: utils.c.i
-.PHONY : utils.i
-
-# target to preprocess a source file
-utils.c.i:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/utils.c.i
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/utils.c.i
-.PHONY : utils.c.i
-
-utils.s: utils.c.s
-.PHONY : utils.s
-
-# target to generate assembly for a file
-utils.c.s:
-	$(MAKE) -f CMakeFiles/netlem.dir/build.make CMakeFiles/netlem.dir/utils.c.s
-	$(MAKE) -f CMakeFiles/netlem_ds.dir/build.make CMakeFiles/netlem_ds.dir/utils.c.s
-.PHONY : utils.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... netlem"
-	@echo "... netlem_ds"
-	@echo "... rebuild_cache"
-	@echo "... events.o"
-	@echo "... events.i"
-	@echo "... events.s"
-	@echo "... game.o"
-	@echo "... game.i"
-	@echo "... game.s"
-	@echo "... netlem.o"
-	@echo "... netlem.i"
-	@echo "... netlem.s"
-	@echo "... netlem_ds.o"
-	@echo "... netlem_ds.i"
-	@echo "... netlem_ds.s"
-	@echo "... utils.o"
-	@echo "... utils.i"
-	@echo "... utils.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
diff --git a/compil.sh b/compil.sh
index 89e6193..a5a2f4e 100755
--- a/compil.sh
+++ b/compil.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
-
-make clean;
+#!/bin/bash -e
+cd bin
+cmake ../src
 make;
 
 gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"&
@@ -9,4 +9,3 @@ gnome-terminal -t CLIENT1 -e "bash -c './netlem piou.prosoluce.fr; sleep 15'"&
 sleep 1;
 gnome-terminal -t CLIENT2 -e "bash -c './netlem piou.prosoluce.fr; sleep 15'"&
 
-exit 0;
diff --git a/src/events.c b/src/events.c
index 4436ed7..95be9e9 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,7 +1,7 @@
 #include <stdlib.h> // calloc
 #include <string.h> //memcpy
 
-#include "src/events.h"
+#include "events.h"
 
 inline int eventSerializedSize() {
 	//FIXME : A rendre portable
diff --git a/src/game.c b/src/game.c
index d076dc3..dd04aa4 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,9 +1,9 @@
 #include <stdlib.h> // calloc
 #include <string.h> // memset
 
-#include "src/game.h"
-#include "src/utils.h"
-#include "src/events.h"
+#include "game.h"
+#include "utils.h"
+#include "events.h"
 
 inline tick_t getGameCurrentTick(Uint32 startTime_ms) {
 /*	char buf[128];
diff --git a/src/events.h b/src/include/events.h
index 7f9ca50..7f9ca50 100644
--- a/src/events.h
+++ b/src/include/events.h
diff --git a/src/game.h b/src/include/game.h
index 6bb1583..6bb1583 100644
--- a/src/game.h
+++ b/src/include/game.h
diff --git a/src/utils.h b/src/include/utils.h
index 021816d..021816d 100644
--- a/src/utils.h
+++ b/src/include/utils.h
diff --git a/src/netlem.c b/src/netlem.c
index 01d272b..24e95d8 100644
--- a/src/netlem.c
+++ b/src/netlem.c
@@ -4,9 +4,9 @@
 #include "SDL/SDL_net.h"
 #include "SDL/SDL_thread.h"
 
-#include "src/game.h"
-#include "src/events.h"
-#include "src/utils.h"
+#include "game.h"
+#include "events.h"
+#include "utils.h"
 
 // Application version number
 #include "netlem.h"
diff --git a/src/netlem_ds.c b/src/netlem_ds.c
index 91e4f62..e4bf007 100644
--- a/src/netlem_ds.c
+++ b/src/netlem_ds.c
@@ -6,9 +6,9 @@
 #include "SDL/SDL_net.h"
 #include "SDL/SDL_thread.h"
 
-#include "src/game.h"
-#include "src/events.h"
-#include "src/utils.h"
+#include "game.h"
+#include "events.h"
+#include "utils.h"
 
 // Application version number and some constants
 #include "netlem_ds.h"
diff --git a/src/utils.c b/src/utils.c
index 44f7ada..0cbe483 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -3,7 +3,7 @@
 #include <string.h> // strerror()
 #include <errno.h>
 
-#include "src/utils.h"
+#include "utils.h"
 
 static FILE *fdLog=NULL;