diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2006-02-02 00:22:26 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2006-02-02 00:22:26 +0000 |
| commit | a5eaeaa9ff39a5568d9425ec57fd1af5dfe79c90 (patch) | |
| tree | f832050a43a0ebf29140e86a825e716e5ce3f87e | |
| parent | 04fd7f09094737fdc520f8064bd130888af93986 (diff) | |
Ignore windows sources in lib/win32 on non-windows platforms.
| -rw-r--r-- | bin/bbackupd/BackupDaemon.h | 4 | ||||
| -rwxr-xr-x | infrastructure/makebuildenv.pl | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/bin/bbackupd/BackupDaemon.h b/bin/bbackupd/BackupDaemon.h index cef09630..8693fe9e 100644 --- a/bin/bbackupd/BackupDaemon.h +++ b/bin/bbackupd/BackupDaemon.h @@ -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; diff --git a/infrastructure/makebuildenv.pl b/infrastructure/makebuildenv.pl index ee0e6506..2cecc00d 100755 --- a/infrastructure/makebuildenv.pl +++ b/infrastructure/makebuildenv.pl @@ -38,6 +38,13 @@ unless(-d 'local') # 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 @@ __E # 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? |