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

Add missing dist files #1835

Merged
merged 2 commits into from Jul 24, 2019

Conversation

@fdelapena
Copy link
Contributor

commented Jul 14, 2019

Towards a proper fix for #1753, workaround for now with the traditional way so far, add guard headers to keep compiler building properly for other ports.

fdelapena added some commits Jul 14, 2019

@fdelapena fdelapena added the Building label Jul 14, 2019

@fdelapena fdelapena added this to the 0.6.1 milestone Jul 14, 2019

@Ghabry

This comment has been minimized.

Copy link
Member

commented Jul 14, 2019

Don't think you need extra header guards in the header.
The header is never included so the compiler won't complain about missing symbols.

@fmatthew5876

This comment has been minimized.

Copy link
Contributor

commented Jul 15, 2019

Don't think you need extra header guards in the header.
The header is never included so the compiler won't complain about missing symbols.

Is it? If you include 3ds_ui.cpp in the automake sources for example then I think 3ds_ui.h gets included.

@fdelapena

This comment has been minimized.

Copy link
Contributor Author

commented Jul 15, 2019

That cpp file has the include guarded, so it's safe in that particular case.

I saw the guard at audio_psp2.h (also at audio_libretro.h), so it also tried to keep some consistency, but I could drop the commit anyways.

@Ghabry

This comment has been minimized.

Copy link
Member

commented Jul 15, 2019

I saw the guard at

Hm, you are right, we are just not consistent there. Keep them.

@Ghabry

Ghabry approved these changes Jul 23, 2019

@Ghabry

This comment has been minimized.

Copy link
Member

commented Jul 24, 2019

oh completely forgot this one, works for me with CMake after make dist 👍

@Ghabry Ghabry merged commit 639fb94 into EasyRPG:master Jul 24, 2019

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.