[cinvoke-svn] r26 - in trunk/cinvoke: lib lib/arch test

[will]

Author: will
Date: 2006-06-15 20:13:17 -0400 (Thu, 15 Jun 2006)
New Revision: 26

Modified:
   trunk/cinvoke/lib/arch/cl_x86_win.c
   trunk/cinvoke/lib/cinvoke.vcproj
   trunk/cinvoke/test/test.vcproj
Log:
fixed windows build


Modified: trunk/cinvoke/lib/arch/cl_x86_win.c
===================================================================
--- trunk/cinvoke/lib/arch/cl_x86_win.c 2006-06-16 00:06:55 UTC (rev 25)
+++ trunk/cinvoke/lib/arch/cl_x86_win.c 2006-06-16 00:13:17 UTC (rev 26)
@@ -25,8 +25,13 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
+#ifdef CINVOKE_BUILD
+#include "../cinvoke.h"
+#include "../cinvoke-private.h"
+#else
 #include "cinvoke.h"
 #include "cinvoke-private.h"
+#endif
 
 char *GetWin32ErrMsg(DWORD err) {
        char *str;

Modified: trunk/cinvoke/lib/cinvoke.vcproj
===================================================================
--- trunk/cinvoke/lib/cinvoke.vcproj    2006-06-16 00:06:55 UTC (rev 25)
+++ trunk/cinvoke/lib/cinvoke.vcproj    2006-06-16 00:13:17 UTC (rev 26)
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ARCH_CL_X86_WIN"
+                               
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ARCH_CL_X86_WIN;CINVOKE_BUILD"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="5"
@@ -39,10 +39,7 @@
                        <Tool
                                Name="VCPostBuildEventTool"/>
                        <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="..\tools\copyifnewer 
arch\cl_x86_win.c cinvoke-archspec.c
-..\tools\copyifnewer arch\cl_x86_win.h cinvoke-archspec.h
-"/>
+                               Name="VCPreBuildEventTool"/>
                        <Tool
                                Name="VCPreLinkEventTool"/>
                        <Tool
@@ -65,7 +62,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ARCH_CL_X86_WIN"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ARCH_CL_X86_WIN;CINVOKE_BUILD"
                                RuntimeLibrary="4"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -82,10 +79,7 @@
                        <Tool
                                Name="VCPostBuildEventTool"/>
                        <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="..\tools\copyifnewer 
arch\cl_x86_win.c cinvoke-archspec.c
-..\tools\copyifnewer arch\cl_x86_win.h cinvoke-archspec.h
-"/>
+                               Name="VCPreBuildEventTool"/>
                        <Tool
                                Name="VCPreLinkEventTool"/>
                        <Tool
@@ -109,8 +103,7 @@
                        <File
                                RelativePath=".\arch\cl_x86_win.c">
                                <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="TRUE">
+                                       Name="Debug|Win32">
                                        <Tool
                                                Name="VCCLCompilerTool"/>
                                </FileConfiguration>
@@ -118,8 +111,7 @@
                        <File
                                RelativePath=".\arch\cl_x86_win.h">
                                <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="TRUE">
+                                       Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"/>
                                </FileConfiguration>
@@ -129,12 +121,6 @@
                        RelativePath=".\cinvoke-arch.h">
                </File>
                <File
-                       RelativePath=".\cinvoke-archspec.c">
-               </File>
-               <File
-                       RelativePath=".\cinvoke-archspec.h">
-               </File>
-               <File
                        RelativePath=".\cinvoke-private.h">
                </File>
                <File

Modified: trunk/cinvoke/test/test.vcproj
===================================================================
--- trunk/cinvoke/test/test.vcproj      2006-06-16 00:06:55 UTC (rev 25)
+++ trunk/cinvoke/test/test.vcproj      2006-06-16 00:13:17 UTC (rev 26)
@@ -20,7 +20,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\lib"
-                               
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_CL_X86_WIN"
+                               
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_CL_X86_WIN;CINVOKE_BUILD"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="5"
@@ -69,7 +69,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\lib"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_CL_X86_WIN;CINVOKE_BUILD"
                                RuntimeLibrary="4"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"