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

Update CMake File #952

Merged
merged 15 commits into from Sep 18, 2016

Conversation

Projects
None yet
3 participants
@Ghabry
Member

Ghabry commented Jul 25, 2016

This synchronizes the CMake file with the features of the autoconf file and adds a shiny summary table :)

I also tried to simplify the code (400 lines cough) and removed some features I don't see a use for. Wine and Shinonome are gone, Wine test makes no sense and Shinonome can be manually triggered if you really need a recompile.

Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry Aug 6, 2016

Member

@carstene1ns
This is again open for review. But before merging I think I will squash some commits together or you think it's fine?

Member

Ghabry commented Aug 6, 2016

@carstene1ns
This is again open for review. But before merging I think I will squash some commits together or you think it's fine?

void CheckIsDirectory() {
assert(FileFinder::IsDirectory("."));
}
void CheckEnglishFilename() {
assert(!FileFinder::FindImage("Backdrop", "castle").empty());

This comment has been minimized.

@fdelapena

fdelapena Aug 8, 2016

Contributor

The old test was doing a "touch" command for a RTP castle filename written in Japanese, maybe TestGame-2000 should have some filename in Japanese or vice-versa (use chara1 in Japanese in this string), to make this function name still meaningful. Or just rename the function 😜.

@fdelapena

fdelapena Aug 8, 2016

Contributor

The old test was doing a "touch" command for a RTP castle filename written in Japanese, maybe TestGame-2000 should have some filename in Japanese or vice-versa (use chara1 in Japanese in this string), to make this function name still meaningful. Or just rename the function 😜.

This comment has been minimized.

@Ghabry

Ghabry Aug 10, 2016

Member

Well it searches for a file that has a English name :D. But I could change it to a japanese -> english lookup

@Ghabry

Ghabry Aug 10, 2016

Member

Well it searches for a file that has a English name :D. But I could change it to a japanese -> english lookup

@carstene1ns

This comment has been minimized.

Show comment
Hide comment
@carstene1ns

carstene1ns Aug 13, 2016

Member

Unrelated minor visual issue: the sdl2_mixer version stuff does not work, these definitions need to be changed as the header still uses the old version macros (without 2).

Member

carstene1ns commented Aug 13, 2016

Unrelated minor visual issue: the sdl2_mixer version stuff does not work, these definitions need to be changed as the header still uses the old version macros (without 2).

Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
@carstene1ns

This comment has been minimized.

Show comment
Hide comment
@carstene1ns

carstene1ns Aug 19, 2016

Member

IMO the "line" status messages are not needed and look bad as the summary is separated by empty lines anyway and the length of them is arbitrary, but this may be personal preference.

Member

carstene1ns commented Aug 19, 2016

IMO the "line" status messages are not needed and look bad as the summary is separated by empty lines anyway and the length of them is arbitrary, but this may be personal preference.

Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry Sep 11, 2016

Member

I hope this was the last change now :D

Member

Ghabry commented Sep 11, 2016

I hope this was the last change now :D

@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry Sep 11, 2016

Member

No it wasnt. Found a problem in combination with PLAYER_BUILD_LIBLCF which only happens without auxing... trying to fix this tomorrow >.>

Member

Ghabry commented Sep 11, 2016

No it wasnt. Found a problem in combination with PLAYER_BUILD_LIBLCF which only happens without auxing... trying to fix this tomorrow >.>

Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt
Show outdated Hide outdated CMakeLists.txt

Ghabry added some commits Jul 20, 2016

Begin updating CMake to support newest Player features.
Remove unnessary code (e.g. Wine) and allow making some options optional (testing).
CMake: Simplify code a bit. Remove Shinonome build-step. Consistent w…
…hite spacing.

liblcf building is currently broken, the shared lib must be used.
set(FLUIDSYNTH_INCLUDE_DIRS ${FLUIDSYNTH_INCLUDE_DIR})
set(FLUIDSYNTH_LIBRARIES ${FLUIDSYNTH_LIBRARY})
mark_as_advanced(FLUIDSYNTH_INCLUDE_DIR FLUIDSYNTH_LIBRARY)

This comment has been minimized.

@carstene1ns

carstene1ns Sep 18, 2016

Member

This is needed for XMP, too 💃.

@carstene1ns

carstene1ns Sep 18, 2016

Member

This is needed for XMP, too 💃.

This comment has been minimized.

@Ghabry

Ghabry Sep 18, 2016

Member

hmmm

@Ghabry

@carstene1ns carstene1ns merged commit 4930c4f into EasyRPG:master Sep 18, 2016

6 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details

@Ghabry Ghabry deleted the Ghabry:cmake branch Jan 24, 2017

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