Skip to content

Commit

Permalink
CI: Use x86 build for Windows
Browse files Browse the repository at this point in the history
required for asmdll interop
  • Loading branch information
smx-smx committed May 30, 2023
1 parent 9ac5296 commit 4d70d0d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ linux_x64_task:
path: build/AsmTool*.zip


windows_x64_task:
windows_x86_task:
windows_container:
cpu: 2
memory: 2G
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,22 @@ if(WIN32)
set(REKO_COMPILER "Visual Studio 17 2022")
endif()

set(target_platform "")
if(WIN32)
# required for asmdll interop
set(target_platform PLATFORM x86)
endif()

ADD_DOTNET(${CMAKE_SOURCE_DIR}/AsmTool.sln
${target_platform}
CONFIG ${CMAKE_BUILD_TYPE}
TARGET_NAME AsmTool_sln
)

if(UNIX)
enable_language(C)
add_subdirectory(AsmTool/Linux)
add_dependencies(AsmTool_sln asmIoLinux)
endif()

include(FindSevenZip)
Expand Down

0 comments on commit 4d70d0d

Please sign in to comment.