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

Pull fallguy develop may #1179

Merged
merged 287 commits into from
Sep 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
287 commits
Select commit Hold shift + click to select a range
90c7b96
fixed problems with MOAIGfxResource lifecycle (and bug in ZLLog)
Sep 5, 2015
a2eb066
renamed ZL -gles source files
Sep 6, 2015
0702c86
fixed frame buffer grad (immediate mode only)
Sep 6, 2015
39a12a3
fixed bug in MOAIImage introduced by ZLCopyOnWrite
Sep 10, 2015
50c0c29
myriad regression fixes from running samples
Sep 10, 2015
33ab031
more fixes to samples
Sep 20, 2015
88fa8a1
fixes to frame buffer in retained mode api
Sep 20, 2015
f42b67a
fixed some MOAIGfxResource lifecycle issues; moving toward error hand…
Sep 21, 2015
48c7e12
Added interface for Facebook to get user name
Sep 24, 2015
db56d75
added multithread support for loading and drawing display lists to SD…
Sep 28, 2015
71e5b9d
remembered to call 'Stop' on SDL host loading thread
Sep 28, 2015
a74aa83
more async testing and fixes; went back to original timer-less ssl ga…
Sep 28, 2015
5b5b440
added TODO commend about an edge case that causes some resources to f…
Sep 28, 2015
b28874b
renaming 'list' to 'pipeline' in MOAIGfxDeviceBase
Sep 28, 2015
8dee9b2
improvements, bug fixes to async pipeline handling; added display lis…
Sep 30, 2015
bd7200c
fixed bug in default framebuffer detection
Sep 30, 2015
2943817
Fixed class reference for MOAIAndroidBilling
Oct 16, 2015
7a07ae6
harfbuzz proof of concept - Xcode and OS X only
Oct 26, 2015
32b2f6a
Merge remote-tracking branch 'fallguyconsulting/develop' into develop
zeflash Oct 29, 2015
0bd3cd6
Fixed regression in QuadListDeck2D
zeflash Oct 29, 2015
ce25a5d
added some comments
Oct 29, 2015
4674c4e
CustomLogFunc takes a level now
zeflash Oct 30, 2015
3ea2170
starting work on text layout pipeline refactor
Oct 31, 2015
00c16ff
renamed MOAITextDesigner to MOAITextLayoutRules; renamed MOAITextDesi…
Nov 1, 2015
68f70c8
more work on refactored/improved text layout engine
Nov 1, 2015
2d1634a
renamed a member and a param to reflect class name changes - MOAIText…
Nov 1, 2015
078b8f1
Merge pull request #3 from Plumzi/develop
patrickmeehan Nov 1, 2015
3ad4fa1
Merge branch 'develop' into develop-plumzi
Nov 1, 2015
b3862f1
fix to fix to MOAIGfxQuadListDeck2D regression; removed re-added (old…
Nov 1, 2015
e9f7e86
new/updated samples
zeflash Nov 3, 2015
7b7fbeb
renamed edtaa to moai_edtaa
Nov 6, 2015
5d3b49d
update 3rdpartty-contrib.mk
Nov 6, 2015
c4184dc
split iOS 3rdparty core into its component libraries
Nov 6, 2015
6a50c1b
Merge branch 'develop' of github.com:fallguyconsulting/moai-dev into …
Nov 6, 2015
788912e
Added new line at end of files that were missing them so that we pass…
joshlytlepi Nov 6, 2015
0024fbb
Removed a few crypto header references I found sitting in the image m…
joshlytlepi Nov 7, 2015
7e83e8e
fix for quad list deck material index regression
Nov 9, 2015
9959069
improvements to text wrapping rules
Nov 9, 2015
6ed9d3c
Merge pull request #5 from Plumzi/feature/shader+pex-plugin-issue
patrickmeehan Nov 9, 2015
afbcb8c
Fixed a warning in the 32-bit build.
joshlytlepi Nov 9, 2015
beacd75
text layout regression fixes
Nov 10, 2015
23e35ff
exposed better control of MOAIInputMgr auto timestamp feature through…
Nov 10, 2015
029f3ad
fixing text layout anim curves
Nov 11, 2015
2d8a4db
more regression fixing in text layout system - should be back to pari…
Nov 11, 2015
ae7224a
Added getter functions for session token info and additional params i…
Nov 11, 2015
911d194
Add in DeltaDNA SDK
Nov 13, 2015
7305b46
removed calls to AKUHarness from aku_modules.cpp
Nov 14, 2015
836480e
fixed multiple inclusion of 3rdparty contrib sources
Nov 16, 2015
f3b7138
Merge branch 'develop' into develop-casinowonders
Nov 16, 2015
8c28076
Merge branch 'develop' into feature/gfx-async
Nov 16, 2015
1a18658
fixed crash/no draw bug; restored SDL host default to multithreaded
Nov 16, 2015
12dae83
updated SDLHost.cpp
Nov 16, 2015
6241b05
added release () as a convenience method to MOAIMultiTexture
Nov 16, 2015
5f4f985
fixed delta dna integration after merge
Nov 17, 2015
d503850
tweaks to MOAILayer::wndToWorldRay
Nov 17, 2015
1165799
Fixes to android project
Nov 18, 2015
31ebb34
Introduced a new preprocessor AKU_WITH_IFA which wraps Moai's referen…
joshlytlepi Nov 19, 2015
70f384a
fixed some compile errors; restored proper architecture selection for…
Nov 20, 2015
c1ab8e4
Fixed iOS and OSX project files to build with new changes
Nov 20, 2015
4d26b39
image convolution
Nov 21, 2015
11f504f
gaussian kernel helper
Nov 21, 2015
f6a6515
commented out legacy MOAIImage blur
Nov 21, 2015
5eae7a8
Merge branch 'develop' into feature/gfx-async
Nov 23, 2015
ef4eb01
comments in ZLCopyOnWrite
Nov 23, 2015
777c97a
adding ZLAllocator base class
Nov 24, 2015
08de571
fixing crash (due to assert) when attempting to render text from a fo…
Nov 25, 2015
6343e25
fix for arm64-v8a build
Nov 25, 2015
42c474e
Fixed arm64 linking error
Nov 26, 2015
bcfa69b
added HIGHP to OPENGL_PREPROC, OPENGL_ES_PREPROC
Nov 26, 2015
da5bded
stubbed in a few more flavors of ZLAllocator; wired support into ZLRe…
Nov 27, 2015
cb9dab4
backed out ZLAllocator; added support for rapidly changing buffers (v…
Nov 29, 2015
30a933a
fix to destructor call in ZLLeanPool.h
Nov 29, 2015
e722ae7
fixed some warnings
Nov 29, 2015
4db8c42
fixed replace for assert (in libtess, via header search paths)
Dec 1, 2015
2a3e099
add name and email for facebook idk lua interface
ConghuZhao Dec 2, 2015
b536fc6
getting started on multithreaded iOS host sample
Dec 3, 2015
426e235
backed out poorly conceived change to jansson config (undef of NDEBUG)
Dec 5, 2015
5215e25
should have been _DEBUG, not DEBUG
Dec 5, 2015
200d1ef
went all-in with _DEBUG *and* DEBUG
Dec 5, 2015
1cf72f6
improved the way MOAIParticlePexPlugin calculates its emission frequency
Dec 7, 2015
f1207f4
Merge commit '1cf72f63f36ab5114dc47a184fcc703e2780a542' into develop-…
Dec 9, 2015
e706f59
Swap enum values to fix back button event
Dec 10, 2015
861c701
added -Dverbose=-1 to silence scary-but-harmless zlib messages
Dec 12, 2015
1f83190
fixed glitch causing loading pipeline to incorrectly report content
Dec 13, 2015
24aea6a
simplified use of condition variables to implement "wait until done" …
Dec 13, 2015
185ee2f
configuring optional async support in iOS host
Dec 13, 2015
1d43434
changed 'create' to 'initWithLayer'
Dec 13, 2015
d5f0b29
added check to see if frame is ready (and has not been displayed) to …
Dec 13, 2015
191e2de
first pass of progressive bezier curve flattener (with tests)
Dec 20, 2015
5b348d9
more work on progressive bezier flattener
Dec 22, 2015
21c6305
code formatting for MOAIAudioSamplerCocoa, MOAIUntzSampleBuffer; sam…
Dec 22, 2015
8077981
added kissfft as a git submodule and update 3rd party license doc
Dec 24, 2015
1f79a50
simple binding for kissfft via MOAIFourier
Dec 25, 2015
b4ce16a
work on audio sampler and sample converter
Dec 27, 2015
4087afd
Turned on the Deployment Post Processing Xcode build configuration fl…
joshlytlepi Dec 30, 2015
019cea4
Undid the Deployment Post Processing = YES setting. This started caus…
joshlytlepi Dec 31, 2015
1af1989
added addChildren () to MOAIAction
Dec 31, 2015
d6a35c5
Merge branch 'develop' into feature/audio-sampler
Jan 2, 2016
0b94fe3
finished implementation of MOAIFourier; wrote a sample to test/demo M…
Jan 2, 2016
c4c3bd7
added link to handy reference site in fourier sample
Jan 2, 2016
9d1e6a2
lib kissfft added for android build
ConghuZhao Jan 4, 2016
62db3fa
exposed discard methods through MOAIMemStream; added ZLRingAdapter an…
Jan 6, 2016
58c7cc8
more work on MOAIFourier and audio meter
Jan 10, 2016
7225935
android add kissfft kiss_fftr.c
ConghuZhao Jan 11, 2016
36a39fe
bug fix for ZLMemStream SetCursor () regression
Jan 12, 2016
301ca2d
changed buffer size in audio meter demo
Jan 12, 2016
56d3135
bumped civet web submodule
Jan 13, 2016
d0c3557
Merge branch 'develop' into feature/gfx-async
Jan 14, 2016
18f3359
disabled async iOS host by default; added DEBUG, _DEBUG and NDEBUG pr…
Jan 15, 2016
cccdb4c
Merge branch 'develop' into develop-casinowonders
Jan 15, 2016
ed749d8
Merge branch 'develop' into feature/gfx-async
Jan 15, 2016
b1be0e4
no plugin for OS X build
ConghuZhao Jan 15, 2016
319d8a3
add missing mUnitsToMeters multiply to _getRayCast
kevinw Jan 16, 2016
6557865
more work on MOAIFourier - support for averaging into octave bands (u…
Jan 17, 2016
b731aaf
Merge branch 'develop' into feature/gfx-async
Jan 19, 2016
25bf3d8
updated bezier path stepper
Jan 19, 2016
cd5c596
Merge branch 'develop' into feature/gfx-async
Jan 19, 2016
6ac27fe
merge with gfxasync
Jan 19, 2016
c35c0a2
fixes for unsupported gl calls on android
Jan 20, 2016
c61e566
fixes to get ZLGfx to build for android
Jan 20, 2016
01caadc
fixed a *serious* regression in MOAIAction and MOAICoroutine (setDefa…
Jan 20, 2016
4fd76f4
Merge branch 'develop-legacy' into develop
Jan 20, 2016
4c28118
Merge pull request #6 from kevinw/patch-1
patrickmeehan Jan 20, 2016
087b80f
changed new coroutine to *not* automatically make themselves default …
Jan 20, 2016
0bb79c3
Merge branch 'develop-legacy' into develop
Jan 20, 2016
5131df9
Merge branch 'develop' into feature/harfbuzz
Jan 21, 2016
9732e6a
working on restoring harfbuzz build
Jan 21, 2016
e7cb7e7
fixed build after merge
Jan 21, 2016
6979d5e
fix for buffered drawing pipeline glitch
Jan 22, 2016
b63b2e6
minor optimization to uniform bind in MOAIShader.cpp
Jan 22, 2016
ef13412
fix for compile error in MOAIMotionMgrIOS.mm
Jan 22, 2016
8a14074
Merge branch 'develop' into feature/harfbuzz
Jan 22, 2016
50756d4
added this->Clear () to MOAIMaterialBatch's destructor
Jan 22, 2016
47ea2ca
fixed bad merge of MOAIGfxQuadListDeck2D (8c28076)
Jan 22, 2016
94b6010
fixed crash in MOAITextLayoutEngine
Jan 22, 2016
42cbff4
fixed compile error in MOAIMotionMgrIOS.mm
Jan 22, 2016
83ca0d7
added implementation for setsampleRate in untz for ANDROID
Jan 22, 2016
61a192c
testing fourier octaves
Jan 25, 2016
e829da4
modified aim curve getValueAtTime methods to return span's base keyfr…
Jan 25, 2016
8dba4be
added warning about possibly illegal filter modes to MOAISingleTextur…
Jan 25, 2016
476e4d8
fixed warnings in MOAIImageLoadTask (not clear how this worked before…
Jan 25, 2016
b01a7cd
fix for scary dangerous edge case in ZLFileSys::DeleteDirectory
Jan 26, 2016
96f13d3
Merge branch 'develop-legacy' into develop
Jan 26, 2016
3763029
In the ant-libmoai util config script, updated the preprocessor flag …
joshlytlepi Jan 26, 2016
7801eb8
Fixed function signatures to MOAIGoogleBilling
Jan 27, 2016
e666c03
fixed bug in zl_assert; fixed false warning from MOAISingleTexture
Jan 27, 2016
f762c68
working on fix for VAO, VBO regression
Jan 28, 2016
396fd78
bug fixed in VBO creation
Jan 28, 2016
9929bb9
fixed bug in MOAIVertexArray (needed to explicitly unbind after update)
Jan 28, 2016
a8b92b8
Uncommented Facebook Login Success callback
Jan 28, 2016
8231235
uncommented out modules that should be building with moai
Jan 29, 2016
9988108
added some window functions to MOAIFourier; updated audio-meter sampl…
Jan 31, 2016
1d34a0c
fixed fourier octave averaging; added a bunch of fourier helper methods
Feb 1, 2016
af980e7
changed fourier "index" to "bin" to better match nomenclature
Feb 1, 2016
2b7607a
documentation and some tweaks to MOAIFourier
Feb 1, 2016
3e94f92
fixed call to AKUNotifyGooglePurchaseResponseReceived on Facebook log…
Feb 1, 2016
d3c7d36
fixed unsupported billing error for some devices
Feb 2, 2016
453ffd5
many small fixes - gfx async
Feb 3, 2016
04d03ea
fixed scary (but harmless) zlib spam. again!
Feb 3, 2016
35418d7
modified MOAILuaUtil getHead () to return nil if Lua file magic isn't…
Feb 3, 2016
2bee4f5
fixed goof in MOAILuaUtil file magic const
Feb 4, 2016
29051c9
tested all samples in both immediate and async mode; changed SDL OS X…
Feb 4, 2016
2b940db
added comment re VOAs
Feb 4, 2016
c575e1a
fixed buffer overflow bug when running on a 32 bit platform (sizeof(s…
Feb 5, 2016
ee60b85
deferencing u32* here is a BAD_ACCESS
kevinw Feb 7, 2016
e70b996
fixed inconsistencies in uniform buffer value caching
Feb 8, 2016
1f3540c
WIP graphics refactor. again!
Feb 8, 2016
8b41493
moved default frame buffer and default texture to MOAIGfxStateCache
Feb 8, 2016
a11302c
renamed MOAIGfxDevice to MOAIGfxMgr
Feb 8, 2016
93d77da
rethinking and reworking global shader attributes
Feb 10, 2016
22fe504
renamed MOAIGfxMtxCache to MOAIGfxGlobalsCache
Feb 10, 2016
7af4ffd
Facebook lib interface added for tycoon games
ConghuZhao Feb 16, 2016
be463b3
slight (architectural) improvement to state cache/vertex cache
Feb 16, 2016
1c445c2
moving to composition model for most MOAIGfxMgr subsystems
Feb 16, 2016
e86fdf1
deleted some commented out code - legacy way of updating matrix cache
Feb 16, 2016
d626127
renamed MOAIGfxPipelineMgr to MOAIGfxPipelineClerk
Feb 16, 2016
af61dc6
composed MOAIResourceMgr into MOAIGfxMgr
Feb 16, 2016
2ceb18b
renamed MOAIGfxResourceMgr to MOAIGfxResourceClerk
Feb 16, 2016
282e335
starting work on improved error reporting idiom
Feb 23, 2016
1a8454d
more work on error reporting
Feb 23, 2016
9498f26
Merge branch 'develop' into feature/gfx-refactor
Feb 24, 2016
1dda54d
restoring deck and object drawing
Feb 24, 2016
9fc2a23
fixed up graphics regressions
Feb 24, 2016
12d3eec
added polygon accessors to MOAIRegion; added pushRegion to MOAIVector…
Feb 26, 2016
c3c7f69
fixed crash in ZLMemStream (crash on ReadBytes when stream is empty)
Feb 27, 2016
7981bcf
fixed MOAIVectorTesselator pushRegion; added append () and pad () to …
Feb 27, 2016
b7f30b4
temporarily commenting out line in MOAIInputMgr that waits for the si…
Feb 29, 2016
727b714
tweaks to ZLResult and error reporting; starting to instrument AKU fo…
Mar 1, 2016
649e13a
added some error checking and reporting to AKU
Mar 2, 2016
19836d7
simplified AKU lua function loading code paths and improved error rep…
Mar 2, 2016
acd5f24
error reporting
Mar 3, 2016
6e315df
error handling; placement new/delete for ZLLeanStack
Mar 3, 2016
469ad13
handling constructors/destructors more deliberately in MOAILeanArray …
Mar 4, 2016
2b804d8
Merge branch 'develop' into feature/gfx-refactor
Mar 7, 2016
f3b2f24
Merge branch 'remotes/develop-community' into feature/gfx-refactor-merge
Mar 7, 2016
f0abd31
bumped civitweb submodule
Mar 7, 2016
7f47dd0
got rid of unsupported ci scripts (appveyor, circle); moved host temp…
Mar 8, 2016
278f827
patio improvements; fixed bug in AKUModulesParseArgs
Mar 8, 2016
f5d5424
ZLLeanStack destructor needed explicit call to Resize(0) (before the …
Mar 8, 2016
dad4cdf
Added a mode of calling MOAILuaUtil.getHeader without parameters whic…
joshlytlepi Mar 8, 2016
d291cd4
fix for assert in ZLStreamAdapter
Mar 8, 2016
3c8b34b
Merge branch 'feature/gfx-refactor' of https://github.com/fallguycons…
Mar 8, 2016
a7a0482
fixed MOAIStreamAdapter to use ZLResultCode
Mar 8, 2016
2acc052
fix to ZLCopyOnWrite () SetCursor ()
Mar 8, 2016
33894ff
fix to goof in ZLStream Read <>()
Mar 9, 2016
7e4e55a
additional check for bad loadstring in moat-core host.cpp
Mar 9, 2016
8b5dce7
fix for regressions in MOAIGfxBuffer and MOAIIndexBuffer
Mar 9, 2016
7bcc712
simplified code paths for loading lua via AKU
Mar 10, 2016
b243fd8
MOAISerializer can now serialize metatables
Mar 16, 2016
a93559b
fixes to MOAISerializer; now supports tables, userdata, etc. as keys
Mar 20, 2016
93215ff
exposed MOAIProp getPartition; improvement to MOAISelectionMesh
Mar 22, 2016
90a6535
starting work on vs2015 update
patrickmeehan Mar 23, 2016
6945e32
Commented out default to use VBOs - problem on Android where VBOs are…
joshlytlepi Mar 24, 2016
5a3a1c5
added sdl-2.0.4
Mar 29, 2016
906b7f8
got rid of old sdl; first try at retina support on OSX
Mar 29, 2016
ea67f22
added (untested) combat for GetDeviceToPixelScale on non-apple platforms
Mar 29, 2016
9d1ea41
updated Xcode project settings
Mar 29, 2016
cd55260
Fixed the header search paths in a couple of ant-libmoai modules.
joshlytlepi Mar 31, 2016
90e968f
updated libtess; fixed glitch in line stroking (MOAIVectorUtil)
Apr 2, 2016
7c7fccd
moved subdivideRect to MOAIImage; removed non-pow-2 texture warning (…
Apr 5, 2016
6399736
added AKUDiscardGfxResources ()
Apr 7, 2016
f5c36f0
added support for getting text bounds (with whitespace) to MOAITextLabel
Apr 17, 2016
5ad0d14
tweaked MOAIImage method for generating outline from sdks; added "app…
Apr 27, 2016
ae93873
copied over MOAIImage contributions from tvos (Plumzi) branch
Apr 29, 2016
03a9b4f
Merge pull request #7 from kevinw/la_8_fix
patrickmeehan Apr 29, 2016
bdbe45f
Merge branch 'develop' into feature/gfx-refactor
Apr 29, 2016
e6766ff
added a bunch of getters to MOAIGraphicsProp
May 2, 2016
fec9409
work on recreating visual studio build
patrickmeehan May 4, 2016
61b8c03
added screenScale to MOAIEnvironment (iOS only)
May 4, 2016
8e307a0
tweak to MOAISerializer - ignore metatables on MOAIObjects
May 5, 2016
1aa9976
Added 'scale' parameter to AKUSetScreenSize function.
joshlytlepi May 6, 2016
f4f99f6
backed out change to AKUSetScreenSize
May 6, 2016
466e657
debug lua 5.1 vs2015 build works
patrickmeehan May 13, 2016
8c9ee3c
working vs2015 release build (Lua 5.1)
patrickmeehan May 14, 2016
ee492f1
64-bit build
patrickmeehan May 16, 2016
01a2c5e
simplified vs2015 build schemes
patrickmeehan May 16, 2016
b98e595
bye-bye to vs2008 and vs2010
patrickmeehan May 16, 2016
d6b64f0
Merge branch 'develop' into feature/vs2015
patrickmeehan May 18, 2016
fe0f99e
fixed vs2015 sdl
patrickmeehan May 18, 2016
941c38f
minor improvements to windows version
patrickmeehan May 19, 2016
4c5f039
added filters to visual studio zl-lib-vfs project
patrickmeehan May 20, 2016
abd74c6
added platform headers to zl-lib-vfs (again?)
patrickmeehan May 20, 2016
d0c82c2
fixed build; added ccache support
May 24, 2016
112b46c
fixed vs2015 build
patrickmeehan May 24, 2016
fef345f
fixed unterminated #ifdef
ConghuZhao May 25, 2016
e08777c
revert assert.h to make command line build work
ConghuZhao May 26, 2016
dea7a4e
added offsetIndices to MOAIGeometryWriter
May 26, 2016
fb43e29
fixed annoying regression where moai couldn't run without a gl context
May 26, 2016
4d2478b
wow! such hull! so convex! wow!
Jun 1, 2016
5fea151
factored ZLHull2D into ZLPolygon2D
Jun 2, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
obj/
/bin/
/build/
/lib/

libs/
lib/
obj/
util/libmoai

Thumbs.db
Expand Down Expand Up @@ -38,6 +41,8 @@ bin/api-reference-parser/vendor
docs/api-reference
/moai-sdk/
/bin/env-local.bat
/bin/win32/
/bin/x64/
/util/moai
/**/java/build/
/**/java/*.iml
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "3rdparty/civetweb"]
path = 3rdparty/civetweb
url = https://github.com/civetweb/civetweb.git
[submodule "3rdparty/kissfft"]
path = 3rdparty/kissfft
url = https://github.com/itdaniher/kissfft.git
Binary file not shown.
Empty file.
5 changes: 5 additions & 0 deletions 3rdparty-android/deltadna-v3.3.6/manifest_permissions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- DeltaDNA -->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
32 changes: 32 additions & 0 deletions 3rdparty/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ glew 1.5.6
ISO8601DateFormatter.m, .h
jansson 2.1
jpeg-8c
kissfft
libogg 1.2.2
libvorbis 1.3.2
libpng 1.4.0
Expand Down Expand Up @@ -400,6 +401,37 @@ We are required to state that
CompuServe Incorporated. GIF(sm) is a Service Mark property of
CompuServe Incorporated."

----------------------------------------------------------------
kissfft
----------------------------------------------------------------
Copyright (c) 2003-2010 Mark Borgerding

All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

* Neither the author nor the names of any contributors may be used to endorse
or promote products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

----------------------------------------------------------------
libogg 1.2.2
----------------------------------------------------------------
Expand Down
13 changes: 9 additions & 4 deletions 3rdparty/c-ares-1.7.5/ares_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -962,11 +962,16 @@ DhcpNameServer
status = ARES_EOF;

#elif defined(ANDROID)
char value[PROP_VALUE_MAX]="";
__system_property_get("net.dns1", value);
status = config_nameserver(&servers, &nservers, value);
if (status == ARES_SUCCESS)
#if defined(__arm64__) || defined(__LP64__)

status = ARES_EOF;
#else
char value[PROP_VALUE_MAX]="";
__system_property_get("net.dns1", value);
status = config_nameserver(&servers, &nservers, value);
if (status == ARES_SUCCESS)
status = ARES_EOF;
#endif
#else
{
char *p;
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/c-ares-1.7.5/include-android/ares_build.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
#ifdef CARES_PULL_SYS_SOCKET_H
# include <sys/socket.h>
#endif

/* The size of `long', as computed by sizeof. */
#define CARES_SIZEOF_LONG 4
#define CARES_SIZEOF_LONG sizeof(long)


/* Integral data type used for ares_socklen_t. */
#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t

Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/civetweb
Submodule civetweb updated 303 files
Loading