Skip to content
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.

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

[C API] Add static linking for WIN32 #13744

Merged
merged 7 commits into from
Sep 5, 2024

Conversation

taniabogatsch
Copy link
Contributor

Follow-up of #12709 integrating the changes of @JAicewizard into the new C API generation scripts.

@taniabogatsch
Copy link
Contributor Author

Initial discussion here: #2774

src/include/duckdb.h Outdated Show resolved Hide resolved
src/include/duckdb.h Outdated Show resolved Hide resolved
@JAicewizard
Copy link
Contributor

I already made a PR with these changes (#12709), should I close that one? this one seems better. But this also solves #2774

@taniabogatsch
Copy link
Contributor Author

Yes, if you could close that one, I'd appreciate it. I based this PR on your initial changes and just moved them into the template.

Otherwise, you can also move these changes (and the feedback) into your PR; both are fine by me. 😄

@duckdb-draftbot duckdb-draftbot marked this pull request as draft September 4, 2024 14:02
@taniabogatsch taniabogatsch marked this pull request as ready for review September 4, 2024 14:30
@taniabogatsch
Copy link
Contributor Author

The MIngW build is failing; I'll have a look tomorrow.
https://github.com/duckdb/duckdb/actions/runs/10703802188/job/29678308327?pr=13744

@duckdb-draftbot duckdb-draftbot marked this pull request as draft September 5, 2024 07:34
@taniabogatsch taniabogatsch marked this pull request as ready for review September 5, 2024 07:36
@taniabogatsch
Copy link
Contributor Author

Okay, somehow we need #if defined(_WIN32) && !defined(__MINGW32__) for the Windows / MingW (64 Bit) build to succeed. Unsure why, but this PR does not seem like the place to find out.

@Mytherin Mytherin merged commit 450b7e4 into duckdb:main Sep 5, 2024
41 checks passed
@Mytherin
Copy link
Collaborator

Mytherin commented Sep 5, 2024

Thanks!

@taniabogatsch taniabogatsch deleted the c-api-for-win-fix branch September 5, 2024 12:12
github-actions bot pushed a commit to duckdb/duckdb-r that referenced this pull request Sep 10, 2024
Merge pull request duckdb/duckdb#13744 from taniabogatsch/c-api-for-win-fix
github-actions bot added a commit to duckdb/duckdb-r that referenced this pull request Sep 10, 2024
Merge pull request duckdb/duckdb#13744 from taniabogatsch/c-api-for-win-fix

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants