]> granicus.if.org Git - yasm/commitdiff
1. Tidy up VS 2010 build
authorBrian Gladman <brg@gladman.plus.com>
Sat, 29 Jan 2011 10:50:25 +0000 (10:50 -0000)
committerBrian Gladman <brg@gladman.plus.com>
Sat, 29 Jan 2011 10:50:25 +0000 (10:50 -0000)
2. Set correct VS tool path on win32 systems

svn path=/trunk/yasm/; revision=2368

16 files changed:
Mkfiles/vc10/genmodule/genmodule.vcxproj
Mkfiles/vc10/genmodule/genmodule.vcxproj.filters
Mkfiles/vc10/genperf/genperf.vcxproj
Mkfiles/vc10/genperf/genperf.vcxproj.filters
Mkfiles/vc10/libyasm/libyasm.vcxproj
Mkfiles/vc10/libyasm/libyasm.vcxproj.filters
Mkfiles/vc10/modules/modules.vcxproj
Mkfiles/vc10/modules/modules.vcxproj.filters
Mkfiles/vc10/re2c/re2c.vcxproj
Mkfiles/vc10/re2c/re2c.vcxproj.filters
Mkfiles/vc10/readme.vc10.txt
Mkfiles/vc10/vsyasm.props
Mkfiles/vc10/vsyasm.vcxproj
Mkfiles/vc10/yasm.vcxproj
Mkfiles/vc10/yasm.vcxproj.filters
Mkfiles/vc10/ytasm.vcxproj

index 4a48093b91e19457cfc594f9b5e7def8ca5d779a..eca6ce853f19b79e9c6c5b77d4b5ee5038af1ca7 100644 (file)
   <ItemGroup>\r
     <None Include="run.bat" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
index 85bdf9febd979bb56568ed719b54e3c2b705a9ab..e977736052ce8ea0e6257a98525a82caca19f7f3 100644 (file)
@@ -14,4 +14,7 @@
   <ItemGroup>\r
     <None Include="run.bat" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file
index b94d5a2be609d293159a88902f4590be672a31fc..9d14bf53bd67c3e80209a5cf96e835375ce2708e 100644 (file)
     <ClCompile Include="..\..\..\libyasm\xstrdup.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\..\..\libyasm\phash.h" />\r
     <ClInclude Include="..\..\..\tools\genperf\perfect.h" />\r
     <ClInclude Include="..\..\..\tools\genperf\standard.h" />\r
+    <ClInclude Include="..\..\..\util.h" />\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\libyasm-stdint.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="run.bat" />\r
index 40029ebc108620839c0fee6827d19026ed675f20..f45157d9608201fe99b9195626a10c746f1d1647 100644 (file)
     <ClInclude Include="..\..\..\tools\genperf\standard.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\libyasm-stdint.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm\phash.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\config.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="run.bat" />\r
index af67e44dc3a46183e7a1842f224de1c141a9191c..1498e312c0536a800f7b7ed65dfe3c6646370581 100644 (file)
     <ClCompile Include="..\..\..\libyasm\xstrdup.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\..\libyasm.h" />\r
     <ClInclude Include="..\..\..\libyasm\file.h" />\r
     <ClInclude Include="..\..\..\libyasm\arch.h" />\r
     <ClInclude Include="..\..\..\libyasm\assocdat.h" />\r
     <ClInclude Include="..\..\..\libyasm\intnum.h" />\r
     <ClInclude Include="..\..\..\libyasm\inttree.h" />\r
     <ClInclude Include="..\..\..\libyasm\linemap.h" />\r
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />\r
     <ClInclude Include="..\..\..\libyasm\md5.h" />\r
+    <ClInclude Include="..\..\..\libyasm\module.h" />\r
     <ClInclude Include="..\..\..\libyasm\objfmt.h" />\r
     <ClInclude Include="..\..\..\libyasm\parser.h" />\r
     <ClInclude Include="..\..\..\libyasm\phash.h" />\r
     <ClInclude Include="..\..\..\libyasm\symrec.h" />\r
     <ClInclude Include="..\..\..\libyasm\valparam.h" />\r
     <ClInclude Include="..\..\..\libyasm\value.h" />\r
+    <ClInclude Include="..\..\..\util.h" />\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\libyasm-stdint.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\..\libyasm\module.in" />\r
index 6385583dce7c931b2e61bb1b8110ab52fbf3707e..d1ee2793ee327e44ffe75055513dd595381fba69 100644 (file)
     <ClInclude Include="..\..\..\libyasm\value.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\config.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\libyasm-stdint.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm\listfmt.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm\module.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\..\libyasm\module.in" />\r
index 5fc78cfa0c1eab400004b5fe767921528b9e5c77..9e1f917dee79b102d4268904ee504e9e4056b055 100644 (file)
     <ClCompile Include="..\..\..\modules\listfmts\nasm\nasm-listfmt.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\..\libyasm.h" />\r
+    <ClInclude Include="..\..\..\libyasm\arch.h" />\r
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />\r
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />\r
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />\r
+    <ClInclude Include="..\..\..\libyasm\expr.h" />\r
+    <ClInclude Include="..\..\..\libyasm\file.h" />\r
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />\r
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\insn.h" />\r
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />\r
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />\r
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\md5.h" />\r
+    <ClInclude Include="..\..\..\libyasm\module.h" />\r
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\parser.h" />\r
+    <ClInclude Include="..\..\..\libyasm\phash.h" />\r
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />\r
+    <ClInclude Include="..\..\..\libyasm\section.h" />\r
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />\r
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />\r
+    <ClInclude Include="..\..\..\libyasm\value.h" />\r
     <ClInclude Include="..\..\..\modules\arch\lc3b\lc3barch.h" />\r
     <ClInclude Include="..\..\..\modules\arch\x86\x86arch.h" />\r
     <ClInclude Include="..\..\..\modules\dbgfmts\codeview\cv-dbgfmt.h" />\r
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf-machine.h" />\r
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf.h" />\r
     <ClInclude Include="..\..\..\modules\parsers\gas\gas-parser.h" />\r
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />\r
     <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser.h" />\r
     <ClInclude Include="..\..\..\modules\preprocs\gas\gas-eval.h" />\r
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-eval.h" />\r
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-pp.h" />\r
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm.h" />\r
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h" />\r
+    <ClInclude Include="..\..\..\util.h" />\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\libyasm-stdint.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\genmacro\genmacro.vcxproj">\r
index 1d0ad24488f6ea36064148f55ee19fa91f36ebe4..d66bf48990292230cffe836e173ce1dd7930e3b6 100644 (file)
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h">\r
       <Filter>Source Files\preprocs\nasm</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\libyasm\arch.h" />\r
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />\r
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />\r
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\config.h" />\r
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />\r
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />\r
+    <ClInclude Include="..\..\..\libyasm\expr.h" />\r
+    <ClInclude Include="..\..\..\libyasm\file.h" />\r
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />\r
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\insn.h" />\r
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />\r
+    <ClInclude Include="..\libyasm-stdint.h" />\r
+    <ClInclude Include="..\..\..\libyasm.h" />\r
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\md5.h" />\r
+    <ClInclude Include="..\..\..\libyasm\module.h" />\r
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />\r
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />\r
+    <ClInclude Include="..\..\..\libyasm\parser.h" />\r
+    <ClInclude Include="..\..\..\libyasm\phash.h" />\r
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />\r
+    <ClInclude Include="..\..\..\libyasm\value.h" />\r
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />\r
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />\r
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />\r
+    <ClInclude Include="..\..\..\libyasm\section.h" />\r
+    <ClInclude Include="..\..\..\util.h" />\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
index 88bb5dea03b799f1b25c935c0b894f0f19df8f2f..fb50f146c43ecfb843faf665b8453db4fa2c4a83 100644 (file)
     <ClInclude Include="..\..\..\tools\re2c\dfa.h" />\r
     <ClInclude Include="..\..\..\tools\re2c\globals.h" />\r
     <ClInclude Include="..\..\..\tools\re2c\ins.h" />\r
+    <ClInclude Include="..\..\..\tools\re2c\mbo_getopt.h" />\r
     <ClInclude Include="..\..\..\tools\re2c\parse.h" />\r
     <ClInclude Include="..\..\..\tools\re2c\parser.h" />\r
     <ClInclude Include="..\..\..\tools\re2c\re.h" />\r
index 9416e71d0c806671a412c909f3febef93e891c1a..426ee6eb789a0ff5426e86f5b587dca3ad474f9f 100644 (file)
@@ -70,6 +70,9 @@
     <ClInclude Include="..\..\..\tools\re2c\token.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\tools\re2c\mbo_getopt.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="run.bat" />\r
index a390d6615ba363ddfe299376be7e72cd089fd0d2..0182520be7cb354dfa6705cbd0513f36cfde7832 100644 (file)
@@ -2,7 +2,7 @@ Building YASM with Microsoft Visual Studio 2010 (C/C++ v10)
 -----------------------------------------------------------\r
 \r
 This note describes how to build YASM using Microsoft Visual\r
-Studio 2010 (C/C++ v10 - currently releasxed as beta 2).  \r
+Studio 2010 (C/C++ v10).\r
 \r
 1. The Compiler\r
 ---------------\r
@@ -36,18 +36,22 @@ as appropriate to build the YASM binaries that you need.
 --------------------------------------------------------\r
 \r
 The YASM version vsyasm.exe is designed specifically for use\r
-with Visual Studio 2010.  To tell Visual Studio where to find\r
+with Visual Studio 2010. To tell Visual Studio where to find\r
 vsyasm.exe, the environment variable YASMPATH can be set to \r
 the absolute path of the directory in which vsyasm.exe is\r
 located (this path should include the final backslash). \r
 \r
 Alternatively you can find the directory (or directories) \r
 where the VC++ compiler binaries are located and put copies \r
-of the vsyasm.exe binary in these directories. A typical \r
-location is:\r
+of the vsyasm.exe binary in these directories. The typical \r
+location on 64-bit Windows is:\r
 \r
 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\r
 \r
+On 32-bit Windows it is normally at:\r
+  \r
+C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\r
+\r
 Depending on your system you can use either the win32 or the\r
 x64 version of vsyasm.exe, which must be named vsyasm.exe. \r
 \r
@@ -61,6 +65,10 @@ ways to do this:
   which is typically at:\r
 \r
     C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\r
+  \r
+  or:\r
+  \r
+    C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\r
 \r
   b. put them in a convenient location and set this path in the \r
      'Build Customisations Search Path' in the Visual Studio \r
@@ -108,4 +116,4 @@ I am most grateful for the fantastic support that Peter Johnson,
 YASM's creator, has given me in tracking down issues in using\r
 YASM for the production of Windows x64 code.\r
 \r
-  Brian Gladman, 10th June 2010\r
+  Brian Gladman, 29th January 2011\r
index 66308c4c09a1d266a491380605fde0c58c26168c..89476f2e3b23ca766bc74892dae9e4dfca7b0f45 100644 (file)
@@ -10,7 +10,7 @@
       Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
-    <YasmPath Condition= "'$(YASMPATH)' == ''">C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\</YasmPath>\r
+    <YasmPath Condition= "'$(YASMPATH)' == ''">$(VCInstallDir)bin\</YasmPath>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <YASM>\r
index 0c6e22a2b7eea6e3842610c6c750552be348cabc..a5ed26043e659343cb563ee55e00eec2c8eb940b 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\frontends\yasm\yasm-options.h" />\r
+    <ClInclude Include="..\..\frontends\yasm\yasm-plugin.h" />\r
+    <ClInclude Include="..\..\libyasm.h" />\r
+    <ClInclude Include="..\..\libyasm\bitvect.h" />\r
+    <ClInclude Include="..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\..\util.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
index bf663e78fa7dff11082aa7fd28c32fa19d9a0c17..9379d70a7bfe659d0e7c9646b6b91dd1edeba310 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\frontends\yasm\yasm-options.h" />\r
+    <ClInclude Include="..\..\frontends\yasm\yasm-plugin.h" />\r
+    <ClInclude Include="..\..\libyasm.h" />\r
+    <ClInclude Include="..\..\libyasm\bitvect.h" />\r
+    <ClInclude Include="..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\..\util.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="genstring\genstring.vcxproj">\r
index 9f3aa7285113da208940d6e008df9497f4737204..df5419b83bca3c4e97842d48757fccece1a1c982 100644 (file)
     <ClInclude Include="..\..\frontends\yasm\yasm-options.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\libyasm\compat-queue.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\libyasm.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\libyasm\bitvect.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\frontends\yasm\yasm-plugin.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
index 1599a15b1cab210fd76608a705871900489ef950..d45cdf4843c30d5896b54e4581b0752af8bd2408 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\frontends\tasm\tasm-options.h" />\r
+    <ClInclude Include="..\..\libyasm.h" />\r
+    <ClInclude Include="..\..\libyasm\bitvect.h" />\r
+    <ClInclude Include="..\..\libyasm\compat-queue.h" />\r
+    <ClInclude Include="..\..\util.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="libyasm\libyasm.vcxproj">\r