linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2261
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-21 21:32:22 +0200
message:
  fix natupnp detection on mingw
modified:
  SConstruct
  win32/SConscript
  win32/UPnP_COM.cpp


--
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	2010-10-07 17:16:37 +0000
+++ SConstruct	2010-10-21 19:32:22 +0000
@@ -133,7 +133,7 @@
 
 env.SConsignFile()
 
-env.Append(CPPPATH = ['#/boost/', '#/intl/'])
+env.Append(CPPPATH = ['#/', '#/boost/', '#/intl/'])
 
 # boost defines
 if dev.is_win32():
@@ -165,6 +165,7 @@
 	defs = gcc_defs
 
 	env.Tool("gch", toolpath=".")
+
 	env.Append(CPPPATH = ['#/htmlhelp/include/'])
 	env.Append(LIBPATH = ['#/htmlhelp/lib/'])
 

=== modified file 'win32/SConscript'
--- win32/SConscript	2010-10-07 17:25:06 +0000
+++ win32/SConscript	2010-10-21 19:32:22 +0000
@@ -17,7 +17,7 @@
 
 env.Append(LIBS = ['comctl32', 'ws2_32', 'ole32', 'gdi32', 'comdlg32', 'iphlpapi', 'winmm', 'shlwapi', 'oleaut32', 'uuid'])
 
-env.Append(CPPPATH = ['#/openssl/include', '#/miniupnpc', '#/dwt/include', '#/'])
+env.Append(CPPPATH = ['#/openssl/include', '#/miniupnpc', '#/dwt/include'])
 
 openssl_lib = '#/openssl/lib/'
 if env['arch'] != 'x86':

=== modified file 'win32/UPnP_COM.cpp'
--- win32/UPnP_COM.cpp	2010-10-05 21:48:07 +0000
+++ win32/UPnP_COM.cpp	2010-10-21 19:32:22 +0000
@@ -28,11 +28,6 @@
 const string UPnP_COM::name = "Standard Windows";
 
 #ifdef HAVE_NATUPNP_H
-// for mingw64
-#ifndef interface
-#define interface struct
-#endif
-
 #include <natupnp.h>
 	
 bool UPnP_COM::init() {