Merge lp:~ajs-newmexico/bellepoule/fedora into lp:bellepoule

[ajs]

Four files were changed for this merger proposal

  .bzrignore was added to the top directory. This was done to ignore the generated bin and obj directories and two files generated by the Eclipse IDE

  Makefile was changed by adding table_supervisor.cpp and table_set.cpp to the SRC make variable. This was need ed to complete the link process

  sources/main.cpp was changed by adding a condional compilation preprocessor check around the definitions of swprintf and vswprintf. The changes check for the definition of __MINGW32__ because I believe that they are only necessary when using the MinGW build environment. If they are needed for any Windows build environment, then the test should be for G_OS_WIN32 instead.

  sources/table.hpp was changed by removing the redundant Table:: in the declaration of CompareMatchNumber

With these changes, BellePoulle successfully builds and runs on Fedora 14 in the Eclipse IDE build environment.

Strictly speaking the addition of .bzrignore is not necessary, but it makes the use of Eclipse easier.

WARNING: Use revision 274: there were several revisions where I had inadvertently committed some working files. I am still learning the way that Bazaar does things.

[betonniere (betonniere)]

review: Approve

[lp:~ajs-newmexico/bellepoule/fedora]

275. By ajs-newmexico on 2011-05-06

Modify the Makefile to make it work better for RPM packaging

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-05-06 05:43:22 +0000
@@ -0,0 +1,4 @@
+bin
+obj
+.cproject
+.project

=== modified file 'Makefile'
--- Makefile	2011-01-20 15:52:25 +0000
+++ Makefile	2011-05-06 05:43:22 +0000
@@ -16,7 +16,7 @@
 OPTSDBG=$(OPTS) -g
 
 # Fichiers source à compiler et à linker, ATTENTION à mettre à jour la liste à chaque nouvelle version
-SRCS=attendees.cpp attribute.cpp canvas.cpp canvas_module.cpp checkin.cpp classification.cpp contest.cpp data.cpp filter.cpp general_classification.cpp glade.cpp main.cpp match.cpp module.cpp object.cpp player.cpp players_list.cpp pool_allocator.cpp pool.cpp pool_match_order.cpp pool_supervisor.cpp schedule.cpp score_collector.cpp score.cpp sensitivity_trigger.cpp splitting.cpp stage.cpp swapper.cpp table.cpp tournament.cpp
+SRCS=attendees.cpp attribute.cpp canvas.cpp canvas_module.cpp checkin.cpp classification.cpp contest.cpp data.cpp filter.cpp general_classification.cpp glade.cpp main.cpp match.cpp module.cpp object.cpp player.cpp players_list.cpp pool_allocator.cpp pool.cpp pool_match_order.cpp pool_supervisor.cpp schedule.cpp score_collector.cpp score.cpp sensitivity_trigger.cpp splitting.cpp stage.cpp swapper.cpp table.cpp tournament.cpp table_supervisor.cpp table_set.cpp
 OBJS=$(SRCS:.cpp=.o)
 
 # Nom du fichier exécutable à générer dans $(DBGDIR) et $(RLSDIR)

=== modified file 'sources/main.cpp'
--- sources/main.cpp	2011-02-15 21:47:36 +0000
+++ sources/main.cpp	2011-05-06 05:43:22 +0000
@@ -22,8 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __MINGW32__ // MinGW defines several print functions differently (check for G_OS_WIN32 instead?)
 extern "C" int swprintf (wchar_t *, size_t, const wchar_t *, ...);
 extern "C" int vswprintf(wchar_t *, const wchar_t *, va_list);
+#endif // __MINGW32__
 
 #ifdef WINDOWS_TEMPORARY_PATCH
 #define WIN32_LEAN_AND_MEAN

=== modified file 'sources/table.hpp'
--- sources/table.hpp	2011-04-30 21:43:46 +0000
+++ sources/table.hpp	2011-05-06 05:43:22 +0000
@@ -80,8 +80,8 @@
 
     ~Table ();
 
-    static gint Table::CompareMatchNumber (Match *a,
-                                           Match *b);
+    static gint CompareMatchNumber (Match *a,
+    		                        Match *b);
 
     void LoadMatch (xmlNode *xml_node,
                     Match   *match);