Now the GUI programs (wireshark/gtk2 and qtshark) compile and link

svn path=/trunk/; revision=52538

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a5262c7f20beb9368b75443763cb8303df6476c..d629cdc8ec362b1e61212834ea4c09ae62e252a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -712,18 +712,21 @@ ADD_CUSTOM_COMMAND(
 )
 
 if(UNIX)
-       set(PLATFORM_SRC
+       set(PLATFORM_CAPTURE_SRC
                capture-pcap-util-unix.c
        )
 endif()
 
 if(WIN32)
-       set(PLATFORM_SRC
+       set(PLATFORM_CAPTURE_SRC
                capture_win_ifnames.c
                capture-wpcap.c
                capture_wpcap_packet.c
+       )
+       set(PLATFORM_UI_SRC
                ui/win32/console_win32.c
                ui/win32/file_dlg_win32.c
+               ui/win32/print_win32.c
        )
 endif()
 
@@ -738,7 +741,7 @@ set(SHARK_COMMON_CAPTURE_SRC
 )
 
 set(WIRESHARK_COMMON_SRC
-       ${PLATFORM_SRC}
+       ${PLATFORM_CAPTURE_SRC}
        capture-pcap-util.c
        cfile.c
        cfutils.c
@@ -867,6 +870,7 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
                ws80211_utils.c
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
+               ${PLATFORM_UI_SRC}
        )
 endif()
 
@@ -884,6 +888,7 @@ if(BUILD_wireshark AND GTK_FOUND)
                ${APPLE_CORE_SERVICES_LIBRARY}
                ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
                ${NL_LIBRARIES}
+               ${WIN_COMCTL32_LIBRARY}
        )
        # qtshark and wireshark share wireshark_FILES
 
@@ -1118,7 +1123,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
                sync_pipe_write.c
                version_info.c
                ws80211_utils.c
-               ${PLATFORM_SRC}
+               ${PLATFORM_CAPTURE_SRC}
        )
        add_executable(dumpcap ${dumpcap_FILES})
        add_dependencies(dumpcap svnversion)

diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake
index 754daf67de331de0f1d52256b43f2f09fb39fe43..2080e439731a547d0a55f280941d04b6a81b880f 100644 (file)
--- a/cmake/modules/UseWinLibs.cmake
+++ b/cmake/modules/UseWinLibs.cmake
@@ -12,6 +12,7 @@ if( WIN32 )
 
        set( WIN_PSAPI_LIBRARY    psapi.lib )
        set( WIN_WSOCK32_LIBRARY  wsock32.lib )
+       set( WIN_COMCTL32_LIBRARY comctl32.lib )
 
        set( WIN_SETARGV_OBJECT   setargv.obj )