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

Feature/community 1.7.5 #1180

Merged
merged 353 commits into from
Sep 22, 2017
Merged

Feature/community 1.7.5 #1180

merged 353 commits into from
Sep 22, 2017

Conversation

halfnelson
Copy link
Contributor

Includes all of fallguyconsulting changes up to june 26th.
Fixes required for ios-static, html host and other build problems encountered.

ConghuZhao and others added 30 commits November 25, 2015 13:52
…ia internal cache) directly to ZLGfxRetained; fixed calls to placement destructor (ZLLeanPool.h)
…ag. This actually enables a lot of the code stripping features of Xcode, and in addition, allows other apps which use Moai as a dependency in Xcode to use these features (they will run into compiler errors otherwise). I don't believe this will cause problems for anyone who doesn't care about these features.

Also, I changed the default build configuration for command line builds from Debug to Release. I'm assuming that this wasn't being used by anyone, since "Release" is the more sensible option, and most build scripts override this anyway by passing in their preferred configuration. The reason this feature is important is because when an Xcode project has a custom configuration, then includes a dependent project that does NOT have that same configuration, what does it do? It uses this setting to decide what build configuration to use. So that means that if I make a custom config in my host application called "HockeyApp", for example, then Moai will default to giving me a debug build (which is probably not desirable). In my experience, pretty much every custom config relates to release, and generally you want a release build of your dependencies. So I made this change and I want everyone to be aware of it in case you were relying for some reason the Debug setting....feel free to change it back. My opinion though is that setting it to release is going to work for the vast majority of people more often, and anyone needing debug should come up with a custom solution on their end.
…ing linked builds to grow in size. Until a deeper analysis can be done, it's a good idea to keep the status quo.
joshlytlepi and others added 28 commits June 20, 2016 12:20
…' build configuration so that client projects can utilize this when making libmoai for distribution purposes (without debug symbols).
…onfiguration would not generate debug symbols.
# Conflicts:
#	xcode/libmoai/libmoai.xcodeproj/project.pbxproj
…lls-2

# Conflicts:
#	src/zl-util/ZLCleanup.h
#	src/zl-util/zl_wsocket.cpp
#	vs2015/zl-lib-core/zl-lib-core.vcxproj
#	vs2015/zl-lib-core/zl-lib-core.vcxproj.filters
…v [develop]

Remove ssl and crypto dylibs from OS X build
…s; sort will not be corrupted in case of nested layers)
@patrickmeehan patrickmeehan merged commit 31fc0be into develop Sep 22, 2017
@patrickmeehan patrickmeehan deleted the feature/community-1.7.5 branch October 14, 2017 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants