Remove some things that I added while not understanding the real

problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574

CMakeLists.txt

@@ -284,9 +284,10 @@ endif()
 
 
 if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
-	set(WIRESHARK_LD_FLAGS
-		/LARGEADDRESSAWARE
-	)
+	# Set in Makefile.nmake but doesn't seem to have any effect
+	# set(WIRESHARK_LD_FLAGS
+	# 	/LARGEADDRESSAWARE
+	# )
 else()
 	set(WIRESHARK_LD_FLAGS
 		-Wl,--as-needed

README.cmake

@@ -55,9 +55,8 @@ Note 4:
   To get predictable results please set umask explicitly.
 
 How to do out of tree build (Win32/64):
-[This is early alpha and while the build should build all executables except
- the GUIs don't waste your time testing unless you are willing to fix things
- yourself]
+[This is advanced alpha and should build all executables except the GTK3
+ Wireshark for 32-bit.]
 1) Follow http://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html
    Steps 1-9
 1a) Set WIRESHARK_BASE_DIR=c:\wireshark (the parent directory of the

cmake/modules/UseWinLibs.cmake

@@ -14,8 +14,9 @@ if( WIN32 )
 	set( WIN_WSOCK32_LIBRARY  wsock32.lib )
 	set( WIN_COMCTL32_LIBRARY comctl32.lib )
 
-	set( WIN_SETARGV_OBJECT   setargv.obj )
-
-	set( WS_LINK_FLAGS ${WS_LINK_FLAGS} "${WIN_SETARGV_OBJECT}" )
+	# Looks like this is not needed after all
+	# set( WIN_SETARGV_OBJECT   setargv.obj )
+	#
+	# set( WS_LINK_FLAGS ${WS_LINK_FLAGS} "${WIN_SETARGV_OBJECT}" )
 
 endif()