-
Notifications
You must be signed in to change notification settings - Fork 6
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
Replace old stb_image 1.18 with stb_image 2.30 and stb_image_write 1.16 #53
Conversation
…write 1.16 Pulled from https://github.com/nothings/stb Commit 013ac3beddff3dbffafd5177e7972067cd2b5083 Fixes #13
…e_write 1.16 Pulled from https://github.com/nothings/stb Commit 013ac3beddff3dbffafd5177e7972067cd2b5083
…e_write 1.16 Pulled from https://github.com/nothings/stb Commit 013ac3beddff3dbffafd5177e7972067cd2b5083
To know the modifications that was previously added to the old copy of stb_image, one can compare from the commit before this branch the The big difference is that previously, the stb functions were declared in Other changes is that many minor fixes implemented on I guess it means this can introduce a mismatch if crnlib is linked with another software having built another version of stb. |
cfdc7f4
to
154a8b6
Compare
The update of stb_image will also help to make the examples less Windows-centric, as the very old stb_image was Windows-centric and the copy in |
So, Appveyor says it also builds on MSVC. So it builds everywhere as I verified myself the others. |
1eb136b
to
bb96b93
Compare
bb96b93
to
75318f0
Compare
1973ac0
to
13f0de3
Compare
Did you make any modifications to the upstream file? |
Except the changes done in Edit: I submitted the changes upstream: |
This reintroduces a They have a pending PR for it: Edit: I implemented a similar fix. |
b4a5a37
to
19f931a
Compare
example2/CMakeLists.txt
Outdated
@@ -8,6 +8,8 @@ set(EXAMPLE2_SRCS | |||
${CMAKE_CURRENT_SOURCE_DIR}/example2.cpp | |||
${CMAKE_CURRENT_SOURCE_DIR}/timer.cpp | |||
${CMAKE_CURRENT_SOURCE_DIR}/timer.h | |||
${CMAKE_CURRENT_SOURCE_DIR}/../inc/crnlib.h |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Headers of a dependent library don't really belong in the source list. Same goes for example3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't it what CMake use to know the source has to be rebuilt if the header changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. AFAIK the only use is to index it in IDE projects.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, wouldn't it be a good idea though? I see there are some VS projects there but they are likely unmaintained and will be out of date once this is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. In the VS project setting, headers that are part of the Crunch library should be in the library's sources, not the example sources.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK I removed them.
19f931a
to
67c470f
Compare
Replace old stb_image with stb_image 2.30 and stb_image_write 1.16.
Pulled from https://github.com/nothings/stb
Commit
013ac3beddff3dbffafd5177e7972067cd2b5083
Fixes #13: