diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-21 18:10:31 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-21 18:10:31 +0000 |
| commit | 5af3defc46eb97c75521543274705518bbc0b3f4 (patch) | |
| tree | bfaf3951997f612b4f57f70153e7a692df9c1f3c | |
| parent | 1d4bd1cb3365740974b9b7ae871111a0d078710a (diff) | |
Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj'
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]
svn path=/trunk/; revision=45692
| -rw-r--r-- | ui/Makefile.common | 4 | ||||
| -rw-r--r-- | ui/console_win32.c (renamed from ui/win32/console_win32.c) | 4 | ||||
| -rw-r--r-- | ui/console_win32.h (renamed from ui/win32/console_win32.h) | 0 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common index 9392302d64..a01f7ff6f4 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -54,7 +54,7 @@ WIRESHARK_UI_SRC = \ ssl_key_export.c \ text_import.c \ util.c \ - win32/console_win32.c + console_win32.c noinst_HEADERS = \ alert_box.h \ @@ -75,4 +75,4 @@ noinst_HEADERS = \ ui_util.h \ utf8_entities.h \ util.h \ - win32/console_win32.h + console_win32.h diff --git a/ui/win32/console_win32.c b/ui/console_win32.c index 700105c446..d3f53ca610 100644 --- a/ui/win32/console_win32.c +++ b/ui/console_win32.c @@ -1,7 +1,7 @@ /* console_win32.c * Console support for MSWindows * - * $Id: console_win32.c 45689 2012-10-21 15:04:50Z alagoutte $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -32,7 +32,7 @@ #include <wsutil/file_util.h> #include "console_win32.h" -#include "../../console_io.h" +#include "../console_io.h" #ifdef _WIN32 /* Needed for console I/O */ #if _MSC_VER < 1500 diff --git a/ui/win32/console_win32.h b/ui/console_win32.h index bc4c61e80e..bc4c61e80e 100644 --- a/ui/win32/console_win32.h +++ b/ui/console_win32.h diff --git a/ui/gtk/main.c b/ui/gtk/main.c index a37cd96f7b..e45166277c 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -54,7 +54,7 @@ #endif #include <fcntl.h> #include <conio.h> -#include <ui/win32/console_win32.h> +#include <ui/console_win32.h> #endif #ifdef HAVE_LIBPORTAUDIO diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 1d5eca5c95..416b5d76dc 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -106,7 +106,7 @@ # include <commctrl.h> # include <shellapi.h> # include <conio.h> -# include "ui/win32/console_win32.h" +# include "ui/console_win32.h" #endif /* _WIN32 */ #ifdef HAVE_AIRPCAP |