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

TexturePacker: some cleanup and win32 buildsystem fixes #7961

Merged
merged 3 commits into from
Sep 8, 2015

Conversation

Montellese
Copy link
Member

This replaces #7839 (thanks @UniversaI) and adds two additional (non-critical) fixes to the TexturePacker. The first commit makes sure that running TexturePacker multiple times with the same input always produces the same output. The second commit fixes the debug build configuration in the VS solution.

@Montellese Montellese added Type: Fix non-breaking change which fixes an issue Type: Cleanup non-breaking change which removes non-working or unmaintained functionality labels Sep 4, 2015
@un1versal
Copy link
Contributor

yw.

Question: Isnt Texturepacker able to compile independently from Kodi?
I cant seem to be able to compile Texturepacker without compiling squish (only) from the Kodi project first.

Also once this goes in a new build (would be nice) should be uploaded to mirror so that all fixes and version is in.

@Montellese
Copy link
Member Author

It can't compile independently from Kodi because it shares some source files as well. But those don't have to be pre-built. I never checked the other dependencies but I guess they have to be there already as well.

@un1versal
Copy link
Contributor

Well since I never compiled Kodi here, So with some certainty can claim only squish seems to be required to be built previously to compiling texturepacker. Not a big deal but good to know.

Thx.

@mkortstiege
Copy link
Member

jenkins build this please

std::string path = file.GetPath();
char pathMem[CXBTFFile::MaximumPathLength];
memset(pathMem, 0, sizeof(pathMem));

for (std::string::iterator ch = path.begin(); ch != path.end(); ++ch)

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@Montellese
Copy link
Member Author

I've expanded the comment on how to write the path into the XBT file as requested by @Paxxi. jenkins build this please

@Montellese
Copy link
Member Author

How do we want to handle this with the prebuilt win32 version? We can't update the already uploaded archive with the 1.0.3 version. We can either bump the version to 1.0.4 in the project file and upload a new package with that version or leave the version at 1.0.3 (as fixed by this PR) and upload a new package with 1.0.3-1. @MartijnKaijser preferences?

@Montellese Montellese added this to the Jarvis 16.0-alpha3 milestone Sep 8, 2015
@MartijnKaijser
Copy link
Member

just bump it as that makes most sense.

@Montellese
Copy link
Member Author

Bumped to 1.0.4 but the package is missing (can't upload right now). Will do later and then merge.

@Montellese
Copy link
Member Author

jenkins build and merge

@jenkins4kodi jenkins4kodi merged commit 0b1fe55 into xbmc:master Sep 8, 2015
@Montellese Montellese deleted the fix_texturepacker_win32 branch September 8, 2015 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Type: Fix non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants