[Tux4kids-commits] r344 - tuxmath/trunk/src

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2007-11-26 06:57:34 +0000 (Mon, 26 Nov 2007)
New Revision: 344

Modified:
   tuxmath/trunk/src/Makefile.in
   tuxmath/trunk/src/fileops.c
Log:
Insert appropriate build flags to disable multi-user login on Windows (but hopefully allow tuxmath to be built on Windows!)


Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in	2007-11-26 06:29:31 UTC (rev 343)
+++ tuxmath/trunk/src/Makefile.in	2007-11-26 06:57:34 UTC (rev 344)
@@ -59,7 +59,7 @@
 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"

Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c	2007-11-26 06:29:31 UTC (rev 343)
+++ tuxmath/trunk/src/fileops.c	2007-11-26 06:57:34 UTC (rev 344)
@@ -2629,6 +2629,13 @@
   int n_entries,i;
   char opt_path[PATH_MAX];
 
+#ifdef BUILD_MINGW32
+  // Fixme: The scandir for Windows doesn't support filtering, so this
+  // feature is currently disabled on Windows. Perhaps we just have to
+  // abandon scandir??
+  *subdir_names = NULL;
+  return 0;
+#else
   get_user_data_dir_with_subdir(opt_path);
   n_entries = scandir(opt_path, &namelist, isdir, alphasort);
   if (n_entries > 0) {
@@ -2642,6 +2649,7 @@
     *subdir_names = NULL;
     return 0;
   }
+#endif
 }
 
 /* A utility function to go up one level in a directory hierarchy */