Changeset 5935 for code/branches/pickup/bin

Timestamp:

Oct 13, 2009, 5:05:17 PM (15 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• bin/CMakeLists.txt (modified) (1 diff)
• bin/dedicatedClient.bat.in (copied) (copied from code/trunk/bin/dedicatedClient.bat.in)
• bin/dedicatedClient.in (copied) (copied from code/trunk/bin/dedicatedClient.in)
• bin/vld.ini.in (modified) (2 diffs)

code/branches/pickup/bin/CMakeLists.txt

@@ -26 +26 @@
 
 # Create run scripts for Windows to manually add the DLL path when executing
-SET(RUN_SCRIPTS run standalone client1 client2 server dedicated)
+SET(RUN_SCRIPTS run standalone client1 client2 server dedicated dedicatedClient)
 IF(WIN32)
   FOREACH(_script ${RUN_SCRIPTS})

code/branches/pickup/bin/vld.ini.in

@@ -56 +56 @@
 ;   Default: None.
 ;
-ForceIncludeModules =
+ForceIncludeModules = boost_date_time-vc80-mt-gd-1_39.dll, boost_filesystem-vc80-mt-gd-1_39.dll, boost_system-vc80-mt-gd-1_39.dll, boost_thread-vc80-mt-gd-1_39.dll, enet_d.dll, lua_d.dll, ogg_d.dll, vorbis_d.dll, vorbifile_d.dll
 
 ; Maximum number of data bytes to display for each leaked block. If zero, then
@@ -66 +66 @@
 ;   Default: 4294967295
 ;
-MaxDataDump = 
+MaxDataDump = 0
 
 ; Maximum number of call stack frames to trace back during leak detection.