summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2008-04-13 13:45:50 +0000
committerUlf Lamping <ulf.lamping@web.de>2008-04-13 13:45:50 +0000
commit8de6fc7792015ae185ac4d1d5388ad1717e95867 (patch)
tree091b617b7b7e7be27b639452e00bb7bfbe36d11b /image
parent6fd6381ab30a2920ba61fb157c15515077f4b3b3 (diff)
downloadwireshark-8de6fc7792015ae185ac4d1d5388ad1717e95867.tar.gz
fixes related to file_dlg_win32.rc
svn path=/trunk/; revision=24976
Diffstat (limited to 'image')
-rw-r--r--image/Makefile.nmake2
-rw-r--r--image/file_dlg_win32.rc (renamed from image/win32-file-dlg.rc)2
-rw-r--r--image/wireshark.rc.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index c248b50129..0200094ac1 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -15,7 +15,7 @@ wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake
-e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \
< wireshark.exe.manifest.in > $@
-wireshark.rc : win32-file-dlg.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake
+wireshark.rc : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< wireshark.rc.in > $@
diff --git a/image/win32-file-dlg.rc b/image/file_dlg_win32.rc
index 34d17e12f0..433c700b3e 100644
--- a/image/win32-file-dlg.rc
+++ b/image/file_dlg_win32.rc
@@ -1,6 +1,6 @@
#include <windows.h>
#include "richedit.h"
-#include "../gtk/win32-file-dlg.h"
+#include "../gtk/file_dlg_win32.h"
WIRESHARK_OPENFILENAME_TEMPLATE DIALOG 0, 0, 368, 94
STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in
index 8d6b3392f2..fbb97e44cd 100644
--- a/image/wireshark.rc.in
+++ b/image/wireshark.rc.in
@@ -1,6 +1,6 @@
#include "winver.h"
-#include "win32-file-dlg.rc"
+#include "file_dlg_win32.rc"
WIRESHARK_ICON1 ICON "wireshark.ico"
WIRESHARK_ICON2 ICON "wiresharkdoc.ico"