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

Thrive Linux version #373

Merged
merged 4 commits into from Dec 30, 2015

Conversation

Projects
None yet
3 participants
@hhyyrylainen
Contributor

hhyyrylainen commented Dec 20, 2015

Thrive now builds and runs on linux. Includes a setup script (it should work on fedora, haven't tested if I got the package names correct for ubuntu).

Solves issues: #372 and #368

hhyyrylainen added some commits Dec 12, 2015

Fixed Thrive on linux, the game now builds and runs fine. Added setup…
… script for linux

Fixed crashing due to improperly destroying workspaces.
Fixed CEGUI naming issues
Replaced FindFFMPEG with one found in OgreFFMPEG
Moved FindBullet to windows specific folder to allow building on linux
Removed unnecessary includes that caused errors
Fixed minor complaints that GCC had
Reworked AlphaHitWindow includes to include less stuff in the header
@jjonj

This comment has been minimized.

Show comment
Hide comment
@jjonj

jjonj Dec 20, 2015

Contributor

Looks great! I'll make sure this doesn't break anything on windows!
Does the game run fine for you now then?

Contributor

jjonj commented Dec 20, 2015

Looks great! I'll make sure this doesn't break anything on windows!
Does the game run fine for you now then?

@hhyyrylainen

This comment has been minimized.

Show comment
Hide comment
@hhyyrylainen

hhyyrylainen Dec 20, 2015

Contributor

It does.
I might have to do a pull request to get my OgreFFMPEG installation code into the main repository to avoid having to use my fork in the future.

Contributor

hhyyrylainen commented Dec 20, 2015

It does.
I might have to do a pull request to get my OgreFFMPEG installation code into the main repository to avoid having to use my fork in the future.

@jjonj

This comment has been minimized.

Show comment
Hide comment
@jjonj

jjonj Dec 20, 2015

Contributor

We are actually already using a fork of FFMPEG here: https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer, you can push to that if you are sure it doesn't break anything on windows.
To get your new findFFMPEG to work on windows you need to add this to include hints:
${MINGW_ENV}/install/include
${MINGW_ENV}/install/include/ogre-ffmpeg
and this to library hints:
${MINGW_ENV}/install/lib
${MINGW_ENV}/install/lib/Debug
${MINGW_ENV}/install/lib/Release
During compilation I get an error including the non-existing CEGUI/USize.h, why is there a need for a different cegui version? If you let me know which exact version you're using I can see if it works fine on windows as well

Contributor

jjonj commented Dec 20, 2015

We are actually already using a fork of FFMPEG here: https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer, you can push to that if you are sure it doesn't break anything on windows.
To get your new findFFMPEG to work on windows you need to add this to include hints:
${MINGW_ENV}/install/include
${MINGW_ENV}/install/include/ogre-ffmpeg
and this to library hints:
${MINGW_ENV}/install/lib
${MINGW_ENV}/install/lib/Debug
${MINGW_ENV}/install/lib/Release
During compilation I get an error including the non-existing CEGUI/USize.h, why is there a need for a different cegui version? If you let me know which exact version you're using I can see if it works fine on windows as well

@hhyyrylainen

This comment has been minimized.

Show comment
Hide comment
@hhyyrylainen

hhyyrylainen Dec 22, 2015

Contributor

@jjonj I just pulled in the latest version of CEGUI. Currently at 6051:c84fae85c6d7
Added those hints to FindFFMPEG.
I'll do a pull request to https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer next.

Contributor

hhyyrylainen commented Dec 22, 2015

@jjonj I just pulled in the latest version of CEGUI. Currently at 6051:c84fae85c6d7
Added those hints to FindFFMPEG.
I'll do a pull request to https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer next.

@jjonj

This comment has been minimized.

Show comment
Hide comment
@jjonj

jjonj Dec 26, 2015

Contributor

Alright sounds good, I'll make sure that version works on my end

Contributor

jjonj commented Dec 26, 2015

Alright sounds good, I'll make sure that version works on my end

@Moopli

This comment has been minimized.

Show comment
Hide comment
@Moopli

Moopli Dec 26, 2015

Contributor

+1

Thanks to you I've figured out why my builds were crashing -- Thrive and Ogre were compiled with different optimization levels, but now I went and made sure all the libraries are built RelWithDebInfo, and it works!

Contributor

Moopli commented Dec 26, 2015

+1

Thanks to you I've figured out why my builds were crashing -- Thrive and Ogre were compiled with different optimization levels, but now I went and made sure all the libraries are built RelWithDebInfo, and it works!

@hhyyrylainen

This comment has been minimized.

Show comment
Hide comment
@hhyyrylainen

hhyyrylainen Dec 28, 2015

Contributor

Once my pull request to https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer gets pulled this should be good to go.

Contributor

hhyyrylainen commented Dec 28, 2015

Once my pull request to https://github.com/Revolutionary-Games/ogre-ffmpeg-videoplayer gets pulled this should be good to go.

@jjonj

This comment has been minimized.

Show comment
Hide comment
@jjonj

jjonj Dec 29, 2015

Contributor

That request is now merged!

Contributor

jjonj commented Dec 29, 2015

That request is now merged!

Moopli added a commit that referenced this pull request Dec 30, 2015

Merge pull request #373 from hhyyrylainen/master
Thrive Linux version

Fixes #372 
Fixes #368

@Moopli Moopli merged commit 030c09d into Revolutionary-Games:master Dec 30, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Moopli

This comment has been minimized.

Show comment
Hide comment
@Moopli

Moopli Dec 30, 2015

Contributor

Oh yeah, one note that I just noticed (not a problem at all, really), but on ubuntu we use avresample and not swresample. Since we're looking into switching to Wwise anyway, this isn't a problem at all, I simply changed a line in the CMakeLists (from SWRESAMPLE_LIBRARIES to AVRESAMPLE_LIBRARIES)

Contributor

Moopli commented Dec 30, 2015

Oh yeah, one note that I just noticed (not a problem at all, really), but on ubuntu we use avresample and not swresample. Since we're looking into switching to Wwise anyway, this isn't a problem at all, I simply changed a line in the CMakeLists (from SWRESAMPLE_LIBRARIES to AVRESAMPLE_LIBRARIES)

@jjonj

This comment has been minimized.

Show comment
Hide comment
@jjonj

jjonj Dec 30, 2015

Contributor

This almost certainly breaks some stuff on windows, so a merge might have been a bit premature =P But no biggie, I'll get to fixing it back up.

Contributor

jjonj commented Dec 30, 2015

This almost certainly breaks some stuff on windows, so a merge might have been a bit premature =P But no biggie, I'll get to fixing it back up.

@Moopli

This comment has been minimized.

Show comment
Hide comment
@Moopli

Moopli Dec 31, 2015

Contributor

The merge can be reverted at leisure. In fact, I'll do so now.

There, now you can revert the reversion when it's ready.

Contributor

Moopli commented Dec 31, 2015

The merge can be reverted at leisure. In fact, I'll do so now.

There, now you can revert the reversion when it's ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment