Permalink
Browse files

Visual Studio seems to want to remove settings to build with a specif…

…ic tool. Change the file extension on the 64 bit asm file and change the rules file to match.

(cherry picked from commit 91fab41)
  • Loading branch information...
1 parent ee97b29 commit 82d67734fc9b091ecdd95653aa09a31431ea2315 @mpoindexter mpoindexter committed with Apr 27, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 libffi/masm64.rules
  2. 0 libffi/src/x86/{win64.asm → win64.asm64}
  3. +1 −1 native/com4j.vcproj
View
@@ -9,7 +9,7 @@
DisplayName="Microsoft Macro Assembler(64 bit)"
CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"
Outputs="[$ObjectFileName]"
- FileExtensions="*.asm"
+ FileExtensions="*.asm64"
ExecutionDescription="Assembling..."
>
<Properties>
File renamed without changes.
View
@@ -664,7 +664,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\libffi\src\x86\win64.asm"
+ RelativePath="..\libffi\src\x86\win64.asm64"
>
<FileConfiguration
Name="Debug|Win32"

0 comments on commit 82d6773

Please sign in to comment.