Changeset 1643Tweet

Timestamp:

Jul 18, 2012, 12:47:15 AM (10 years ago)

Author:

sam

Message:

neercs: disable neercs build on Windows for now.

Location:

trunk

Files:

• build/vs2010/Lol.sln (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• tools/neercs/Makefile.am (modified) (2 diffs)

trunk/build/vs2010/Lol.sln

@@ -324 +324 @@
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|PS3.ActiveCfg = Debug|PS3
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.ActiveCfg = Debug|Win32
-                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.Build.0 = Debug|Win32
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.ActiveCfg = Debug|x64
-                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.Build.0 = Debug|x64
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|PS3.ActiveCfg = Release|PS3
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.ActiveCfg = Release|Win32
-                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.Build.0 = Release|Win32
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.ActiveCfg = Release|x64
-                {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.Build.0 = Release|x64
                 {587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
                 {EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|PS3.ActiveCfg = Debug|PS3

trunk/configure.ac

@@ -55 +55 @@
 
 AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h)
-AC_CHECK_HEADERS(fastmath.h pthread.h libutil.h util.h pty.h)
+AC_CHECK_HEADERS(fastmath.h pthread.h libutil.h util.h pty.h glob.h)
 AC_CHECK_HEADERS(sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h)
 AC_CHECK_HEADERS(sys/wait.h)
@@ -370 +370 @@
 
 
+dnl  Can we build neercs?
+AM_CONDITIONAL(BUILD_NEERCS, test "${ac_cv_my_have_caca}" != "no" -a "${ac_cv_header_glob_h}" = "yes")
+
+
 dnl  LolFx compilation rule
 LOLFX_BUILD='(echo "char const *"; echo "lolfx_$(notdir $(basename $(filter %.lolfx, $^))) ="; $(SED) '"'"'s/"/\\"/g'"'"' $(filter %.lolfx, $^) | $(SED) '"'"'s/\([[^\r]]*\).*/"\1\\n"/'"'"'; echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@'

trunk/tools/neercs/Makefile.am

@@ -1 +1 @@
 
-if USE_CACA
+if BUILD_NEERCS
 noinst_PROGRAMS = neercs
 endif
@@ -21 +21 @@
 neercs_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
-if USE_CACA
+if BUILD_NEERCS
 all-local: neercs$(EXEEXT)
         test $(MAKE_FSELF) = no || make_fself neercs$(EXEEXT) neercs.self