Skip to content

Set asmjit to be linked statically on Windows #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Microno95 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set asmjit to be linked statically on Windows #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77e815c
Set asmjit to be linked statically.
Microno95 Aug 4, 2021
916d1f9
Made asmjit compile static only on Windows
Microno95 Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ set(TINYFORMAT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/tinyformat PARENT_SCOPE)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64")
# Build asmjit
set(ASMJIT_BUILD_X64 TRUE)
if (MSVC)
set(ASMJIT_STATIC ON CACHE BOOL " " FORCE)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-undefined-inline")
endif()
Expand Down
3 changes: 3 additions & 0 deletions include/mitsuba/core/jit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
# pragma warning(push)
# pragma warning(disable : 4804) // warning C4804: '~': unsafe use of type 'bool' in operation
# pragma warning(disable : 4245) // warning C4245: 'argument': conversion from 'int' to 'uint32_t', signed/unsigned mismatch
# if !defined(ASMJIT_STATIC) // Fix asmjit dll conflicts when loading mitsuba in python
# define ASMJIT_STATIC
# endif
# endif

# include <asmjit/asmjit.h>
Expand Down