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

[Fedback needed]Minor updates to ASSIMP Viewer #4511

Merged
merged 7 commits into from May 9, 2022
Merged

[Fedback needed]Minor updates to ASSIMP Viewer #4511

merged 7 commits into from May 9, 2022

Conversation

hgdagon
Copy link
Contributor

@hgdagon hgdagon commented Apr 30, 2022

Pretty much the same as #4510 except I was more careful, since this is a GUI application that very much relies on the script for its UI. Also replaced some SourceForge references to GitHub.

@kimkulling
Copy link
Member

Looks fine for me. Just give me a ping when I shall merge it.

kimkulling and others added 4 commits May 3, 2022 17:18
Removed dead link and updated copyright string in the About dialog.
Windres handles it just fine, with the intended result, but RC doesn't seem to like it.
@hgdagon
Copy link
Contributor Author

hgdagon commented May 3, 2022

@kimkulling Done!

@hgdagon hgdagon marked this pull request as ready for review May 3, 2022 22:11
Copy link
Member

@kimkulling kimkulling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will merge it.

@@ -96,7 +96,7 @@ IF ( MSVC )
ENDIF ()

# Link the executable to the assimp + dx libs.
TARGET_LINK_LIBRARIES ( assimp_viewer assimp ${DirectX_LIBRARY} ${DirectX_D3DX9_LIBRARY} comctl32.lib winmm.lib )
TARGET_LINK_LIBRARIES ( assimp_viewer assimp ${DirectX_LIBRARY} ${DirectX_D3DX9_LIBRARY} comctl32 winmm )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

tools/assimp_view/MessageProc.cpp Outdated Show resolved Hide resolved
@kimkulling kimkulling merged commit 6c94347 into assimp:master May 9, 2022
@kimkulling
Copy link
Member

Merged, thanks a lot for your contribution.

@hgdagon hgdagon deleted the assimp_viewer branch May 10, 2022 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants