make dotnet module build again & fix dsp ouput dir

diff --git a/ext/dotnet/dotnet.cpp b/ext/dotnet/dotnet.cpp
index 8ad7f6bc7ccf6d9e663fb047302098aa9c8b0a54..fc9e2ef6785efe3d1be20d7df87e90cf0c8527b8 100644 (file)
--- a/ext/dotnet/dotnet.cpp
+++ b/ext/dotnet/dotnet.cpp
@@ -38,11 +38,11 @@ extern "C" {  /* this should be included in the includes itself !! */
 
 #include "php.h"
 #include "ext/standard/info.h"
+#include "../com/conversion.h"
+#include "../com/php_COM.h"
 
 }
 
-#include "../com/conversion.h"
-#include "../com/php_COM.h"
 #include "Mscoree.h"
 #include "mscorlib.h"
 

diff --git a/ext/dotnet/dotnet.dsp b/ext/dotnet/dotnet.dsp
index 0e6cb28b5511210eb3092236a0ee3a7a4e2359c0..a0b151f68aab4af5397348748f87261aa7559827 100644 (file)
--- a/ext/dotnet/dotnet.dsp
+++ b/ext/dotnet/dotnet.dsp
@@ -40,7 +40,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release"\r
+# PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug"\r
+# PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -92,7 +92,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug_TS"\r
+# PROP Output_Dir "Debug_TS"\r
 # PROP Intermediate_Dir "Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -118,7 +118,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release_TS"\r
+# PROP Output_Dir "Release_TS"\r
 # PROP Intermediate_Dir "Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r

diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index 8ad7f6bc7ccf6d9e663fb047302098aa9c8b0a54..fc9e2ef6785efe3d1be20d7df87e90cf0c8527b8 100644 (file)
--- a/ext/rpc/dotnet/dotnet.cpp
+++ b/ext/rpc/dotnet/dotnet.cpp
@@ -38,11 +38,11 @@ extern "C" {  /* this should be included in the includes itself !! */
 
 #include "php.h"
 #include "ext/standard/info.h"
+#include "../com/conversion.h"
+#include "../com/php_COM.h"
 
 }
 
-#include "../com/conversion.h"
-#include "../com/php_COM.h"
 #include "Mscoree.h"
 #include "mscorlib.h"
 

diff --git a/ext/rpc/dotnet/dotnet.dsp b/ext/rpc/dotnet/dotnet.dsp
index 0e6cb28b5511210eb3092236a0ee3a7a4e2359c0..a0b151f68aab4af5397348748f87261aa7559827 100644 (file)
--- a/ext/rpc/dotnet/dotnet.dsp
+++ b/ext/rpc/dotnet/dotnet.dsp
@@ -40,7 +40,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release"\r
+# PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug"\r
+# PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -92,7 +92,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug_TS"\r
+# PROP Output_Dir "Debug_TS"\r
 # PROP Intermediate_Dir "Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
@@ -118,7 +118,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release_TS"\r
+# PROP Output_Dir "Release_TS"\r
 # PROP Intermediate_Dir "Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r