linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3341
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2013-08-11 17:02:21 +0200
message:
  fixes for VS
modified:
  SConstruct
  dcpp/BufferedSocketListener.h
  dcpp/CID.h
  dcpp/Encoder.h
  dcpp/FileReader.h
  dcpp/Mapper.h
  dcpp/Mapper_NATPMP.cpp
  dcpp/QueueManagerListener.h
  dcpp/SFVReader.h
  dcpp/SSL.h
  dcpp/SimpleBencodeReader.h
  dcpp/Thread.h
  miniupnpc/SConscript


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2013-08-08 18:48:28 +0000
+++ SConstruct	2013-08-11 15:02:21 +0000
@@ -185,6 +185,8 @@
 	if env['arch'] == 'x86':
 		env.Append(CCFLAGS = ['-march=i686'])
 
+if 'msvc' in env['TOOLS']:
+	env['pch'] = True
 if env['pch']:
 	env.Append(CPPDEFINES = ['HAS_PCH'])
 
@@ -281,13 +283,10 @@
 	if conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
 		conf.env.Append(CPPDEFINES='HAVE_HTMLHELP_H')
 
+if 'mingw' in env['TOOLS']:
 	# see whether we're compiling with MinGW or MinGW-w64 (2 different projects that can both build
 	# a 32-bit program). the only differentiator is __MINGW64_VERSION_MAJOR.
-	if conf.CheckDeclaration('__MINGW64_VERSION_MAJOR', '#include <windows.h>', 'C++'):
-		if conf.env['pch']:
-			conf.env['pch'] = 0 # precompiled headers crash mingw64's gcc...
-			conf.env['CPPDEFINES'].remove('HAS_PCH')
-	else:
+	if not conf.CheckDeclaration('__MINGW64_VERSION_MAJOR', '#include <windows.h>', 'C++'):
 		conf.env.Append(CPPDEFINES='HAVE_OLD_MINGW')
 
 if 'gcc' in conf.env['TOOLS'] and conf.env['mode'] == 'debug':

=== modified file 'dcpp/BufferedSocketListener.h'
--- dcpp/BufferedSocketListener.h	2013-01-18 21:28:38 +0000
+++ dcpp/BufferedSocketListener.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_BUFFEREDSOCKETLISTENER_H_
 #define DCPLUSPLUS_DCPP_BUFFEREDSOCKETLISTENER_H_
 
+#include <cstdint>
 #include "noexcept.h"
 #include <string>
 

=== modified file 'dcpp/CID.h'
--- dcpp/CID.h	2013-04-12 21:10:13 +0000
+++ dcpp/CID.h	2013-08-11 15:02:21 +0000
@@ -19,8 +19,9 @@
 #ifndef DCPLUSPLUS_DCPP_CID_H
 #define DCPLUSPLUS_DCPP_CID_H
 
+#include <algorithm>
+#include <cstdint>
 #include <cstring>
-#include <algorithm>
 
 #include "Encoder.h"
 

=== modified file 'dcpp/Encoder.h'
--- dcpp/Encoder.h	2013-04-09 17:20:25 +0000
+++ dcpp/Encoder.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_ENCODER_H
 #define DCPLUSPLUS_DCPP_ENCODER_H
 
+#include <cstdint>
 #include <string>
 
 namespace dcpp {

=== modified file 'dcpp/FileReader.h'
--- dcpp/FileReader.h	2013-01-18 21:28:38 +0000
+++ dcpp/FileReader.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_FILE_READER_H
 #define DCPLUSPLUS_DCPP_FILE_READER_H
 
+#include <cstdint>
 #include <functional>
 #include <string>
 #include <vector>

=== modified file 'dcpp/Mapper.h'
--- dcpp/Mapper.h	2013-01-18 21:28:38 +0000
+++ dcpp/Mapper.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_MAPPER_H
 #define DCPLUSPLUS_DCPP_MAPPER_H
 
+#include <cstdint>
 #include <string>
 #include <set>
 #include <utility>

=== modified file 'dcpp/Mapper_NATPMP.cpp'
--- dcpp/Mapper_NATPMP.cpp	2013-08-08 18:04:01 +0000
+++ dcpp/Mapper_NATPMP.cpp	2013-08-11 15:02:21 +0000
@@ -31,6 +31,9 @@
 #ifndef STATICLIB
 #define STATICLIB
 #endif
+#if defined(_WIN32) && !defined(WIN32)
+#define WIN32
+#endif
 #include <natpmp/getgateway.h>
 #include <natpmp/natpmp.h>
 }

=== modified file 'dcpp/QueueManagerListener.h'
--- dcpp/QueueManagerListener.h	2013-03-30 14:28:28 +0000
+++ dcpp/QueueManagerListener.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_QUEUE_MANAGER_LISTENER_H
 #define DCPLUSPLUS_DCPP_QUEUE_MANAGER_LISTENER_H
 
+#include <cstdint>
 #include <string>
 
 #include "forward.h"

=== modified file 'dcpp/SFVReader.h'
--- dcpp/SFVReader.h	2013-01-18 21:28:38 +0000
+++ dcpp/SFVReader.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_SFV_READER_H
 #define DCPLUSPLUS_DCPP_SFV_READER_H
 
+#include <cstdint>
 #include <string>
 
 #include "noexcept.h"

=== modified file 'dcpp/SSL.h'
--- dcpp/SSL.h	2013-01-18 21:28:38 +0000
+++ dcpp/SSL.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,8 @@
 #ifndef DCPLUSPLUS_DCPP_SSL_H
 #define DCPLUSPLUS_DCPP_SSL_H
 
+#include "w.h"
+
 #include <openssl/ssl.h>
 
 #include <vector>

=== modified file 'dcpp/SimpleBencodeReader.h'
--- dcpp/SimpleBencodeReader.h	2013-01-18 21:28:38 +0000
+++ dcpp/SimpleBencodeReader.h	2013-08-11 15:02:21 +0000
@@ -19,6 +19,7 @@
 #ifndef DCPLUSPLUS_DCPP_SIMPLEBENCODEREADER_H_
 #define DCPLUSPLUS_DCPP_SIMPLEBENCODEREADER_H_
 
+#include <cstdint>
 #include <string>
 #include <boost/noncopyable.hpp>
 

=== modified file 'dcpp/Thread.h'
--- dcpp/Thread.h	2013-08-08 18:04:01 +0000
+++ dcpp/Thread.h	2013-08-11 15:02:21 +0000
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include <cstdint>
+
 #include <boost/noncopyable.hpp>
 #include "Exception.h"
 

=== modified file 'miniupnpc/SConscript'
--- miniupnpc/SConscript	2011-11-07 18:36:42 +0000
+++ miniupnpc/SConscript	2013-08-11 15:02:21 +0000
@@ -5,5 +5,12 @@
 if dev.is_win32():
 	env.Append(CPPDEFINES = ['STATICLIB', 'WIN32'])
 
-ret = dev.build_lib(env, target, sources, dev.c_lib)
+	sources = [source for source in sources if 'minissdpc' not in source]
+
+def msvcproj_files(env):
+	inc, src = dev.c_lib(env)
+	src = [source for source in src if 'minissdpc' not in str(source)]
+	return inc, src
+
+ret = dev.build_lib(env, target, sources, msvcproj_files)
 Return('ret')