Fix CMakeLists.txt for Visual Studio and AMD64 option #336
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
'develop' branch no longer contains inffas8664.c; comment for removal states "Remove old assembler code in which bugs have manifested." Closing pull request as obsolete. |
Open
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In trying to use CMake with VS2017 x64 to build with the hand tuned assembler version of inffast.c, I ran into the problem described in https://stackoverflow.com/questions/29505121/cmake-zlib-build-on-windows.
I found the second solution ("You need contrib\masmx64\inffas8664.c included in visual studio project file") to be the most helpful, and modified the CMakeLists.txt file to optionally append that file to the ZLIB_SRCS list if both MSVC and AMD64 are true. This adds inffas8664.c to the zlib and zlibstatic projects, and both build without any errors in all configurations for x64.