Sign in to follow this  

CMake project fix for MSVC x86_64

This topic is 1955 days old which is more than the 365 day threshold we allow for new replies. Please post a new topic.

If you intended to correct an error in the post then please contact us.

Recommended Posts

Since there's an assembly file for MSVC x86_64 this should be added before or after the ANDROID block in sdk/AngelScript/projects/cmake/CMakeLists.txt:
[code]
if(MSVC AND CMAKE_CL_64)
enable_language(ASM_MASM)
if(CMAKE_ASM_MASM_COMPILER_WORKS)
set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_x64_msvc_asm.asm)
else()
message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
endif()
endif()
[/code]

I also had to edit the code block around line 1131 in angelscript.h from [code]if(sizeof(void*) == 4)[/code] to [code]#ifndef AS_64BIT_PTR[/code], otherwise the compiler would complain about not being able to static cast the data types involved when trying to register CallMe1 in testmultipleinheritance.cpp.

BTW TestSaveLoad reports (but still says it passed)
[code]The saved byte code is not of the expected size. It is 1760 bytes
The saved byte code contains a different amount of zeroes than the expected. Co
nted 530
The saved byte code has different checksum than the expected. Got 0x87C6163E[/code]

Not sure if that's a real problem or not as the test passed anyway.

Share this post


Link to post
Share on other sites
I've checked in these changes, as well as a bug fix in the bytecode saving in revision 1383.

The output from TestSaveLoad was because of a 64bit bug, however it didn't show itself on Linux 64bit. I attribute this to the fact that Microsoft forces all user memory to be mapped to addresses above 4GB, presumably to catch these kind of bugs more easily.

Regards,
Andreas

Share this post


Link to post
Share on other sites

This topic is 1955 days old which is more than the 365 day threshold we allow for new replies. Please post a new topic.

If you intended to correct an error in the post then please contact us.

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

Sign in to follow this