shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert windows

Browse Source
This commit is contained in:
Christoffer Lerno
2026-01-07 03:36:48 +01:00
parent 4ad11724d1
commit 197f82d829
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -7,7 +7,7 @@ on:
branches: [ master, dev ] branches: [ master, dev ]
env: env:
LLVM_RELEASE_VERSION_WINDOWS: 21 LLVM_RELEASE_VERSION_WINDOWS: 18
LLVM_RELEASE_VERSION_MAC: 18 LLVM_RELEASE_VERSION_MAC: 18
LLVM_RELEASE_VERSION_LINUX: 19 LLVM_RELEASE_VERSION_LINUX: 19
LLVM_RELEASE_VERSION_OPENBSD: 19 LLVM_RELEASE_VERSION_OPENBSD: 19

12
CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
set(C3_LLVM_MIN_VERSION 17) set(C3_LLVM_MIN_VERSION 17)
set(C3_LLVM_MAX_VERSION 22) set(C3_LLVM_MAX_VERSION 22)
set(C3_LLVM_DEFAULT_VERSION 21) set(C3_LLVM_DEFAULT_VERSION 19)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
message(FATAL_ERROR "In-tree build detected, please build in a separate directory") message(FATAL_ERROR "In-tree build detected, please build in a separate directory")
@@ -57,7 +57,7 @@ set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
# Use /MT or /MTd # Use /MT or /MTd
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
if(MSVC) if(MSVC)
message(STATUS "MSVC version ${MSVC_VERSION}") message(STATUS "MSVC version ${MSVC_VERSION}")
@@ -142,11 +142,11 @@ if(C3_WITH_LLVM)
endif() endif()
FetchContent_Declare( FetchContent_Declare(
LLVM_Windows LLVM_Windows
URL https://github.com/c3lang/win-llvm/releases/download/llvm_21_1_8/llvm-21.1.8-windows-amd64-msvc17-libcmt.7z URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt.7z
) )
FetchContent_Declare( FetchContent_Declare(
LLVM_Windows_debug LLVM_Windows_debug
URL https://github.com/c3lang/win-llvm/releases/download/llvm_21_1_8/llvm-21.1.8-windows-amd64-msvc17-libcmt-dbg.7z URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt-dbg.7z
) )
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
message("Loading Windows LLVM debug libraries, this may take a while...") message("Loading Windows LLVM debug libraries, this may take a while...")
@@ -435,7 +435,9 @@ if(C3_WITH_LLVM)
target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=1) target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=1)
add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp) add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp)
if (MSVC) if (MSVC)
target_compile_options(c3c PRIVATE "/EHsc") target_compile_options(c3c PRIVATE
"$<$<CONFIG:Debug>:/EHa>"
"$<$<CONFIG:Release>:/EHsc>")
endif() endif()
else() else()
target_sources(c3c PRIVATE src/utils/hostinfo.c) target_sources(c3c PRIVATE src/utils/hostinfo.c)