[Box Backup-dev] COMMIT r359 - in box/trunk: bin/bbackupd infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: martin
Date: 2006-02-02 00:22:26 +0000 (Thu, 02 Feb 2006)
New Revision: 359

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.h
   box/trunk/infrastructure/makebuildenv.pl
Log:
Ignore windows sources in lib/win32 on non-windows platforms.

Modified: box/trunk/bin/bbackupd/BackupDaemon.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.h	2006-02-01 23:54:29 UTC (rev 358)
+++ box/trunk/bin/bbackupd/BackupDaemon.h	2006-02-02 00:22:26 UTC (rev 359)
@@ -19,7 +19,9 @@
 #include "Socket.h"
 #include "SocketListen.h"
 #include "SocketStream.h"
-#include "WinNamedPipeStream.h"
+#ifdef WIN32
+	#include "WinNamedPipeStream.h"
+#endif
 
 class BackupClientDirectoryRecord;
 class BackupClientContext;

Modified: box/trunk/infrastructure/makebuildenv.pl
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl	2006-02-01 23:54:29 UTC (rev 358)
+++ box/trunk/infrastructure/makebuildenv.pl	2006-02-02 00:22:26 UTC (rev 359)
@@ -38,6 +38,13 @@
 # flags about the environment
 my %env_flags;
 
+my $windows_include_path = "-I../../lib/win32 ";
+if ($target_os ne "mingw32" && $target_os ne "winnt")
+{
+	$windows_include_path = "";
+	$env_flags{'IGNORE_lib/win32'} = 1;
+}
+
 # print "Flag: $_\n" for(keys %env_flags);
 
 # seed autogen code
@@ -447,7 +454,7 @@
 	
 
 	# make include path
-	my $include_paths = "-I../../lib/win32 " .
+	my $include_paths = $windows_include_path .
 		join(' ',map {'-I../../'.$_} @all_deps_for_module);
 
 	# is target a library?