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

fix build on MinGW-w64 and MSVC #161

Merged
merged 1 commit into from Aug 23, 2019
Merged

fix build on MinGW-w64 and MSVC #161

merged 1 commit into from Aug 23, 2019

Conversation

Adsun701
Copy link
Contributor

@Adsun701 Adsun701 commented Aug 19, 2019

This sets rsync_EXPORTS on Windows to prevent build failure. In addition, missing LIBRSYNC_EXPORT types are added to certain variables in librsync.h to prevent redefiniton errors on MSVC, and dlls are correctly installed into the bin directory.

Copy link
Member

@dbaarda dbaarda left a comment

Thanks for doing this... I don't have a system where I can test this platform.

Theres on thing in the CMakeLists.txt that I think is not required, but everything else looks fine.

Can you fix and/or confirm if its needed?

CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@dbaarda dbaarda left a comment

The description will also need updating.

NEWS.md Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@dbaarda dbaarda left a comment

We don't want rdiff statically linked, we want it dynamically linked against the rsync library.

If that doesn't work for some reason, there may be other problems we need to fix for MinGW and/or MSVC.

src/librsync_export.h Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
NEWS.md Show resolved Hide resolved
Copy link
Member

@dbaarda dbaarda left a comment

I think the changes to rdiff.c are wrong and should not be required.

If it won't compile without these changes, there must be something else going wrong somewhere.

src/rdiff.c Outdated Show resolved Hide resolved
@Adsun701 Adsun701 changed the title fix build on MinGW-w64 and MSVC [WIP] fix build on MinGW-w64 and MSVC Aug 21, 2019
@Adsun701 Adsun701 changed the title [WIP] fix build on MinGW-w64 and MSVC fix build on MinGW-w64 and MSVC Aug 23, 2019
Copy link
Member

@dbaarda dbaarda left a comment

Thanks for doing this and being patient with all the back-and-forth to get this right.

@dbaarda dbaarda merged commit cd40453 into librsync:master Aug 23, 2019
1 check passed
@Adsun701 Adsun701 deleted the win32-fixes branch Aug 23, 2019
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.

None yet

2 participants