diff --git a/.gitignore b/.gitignore index e5891c7f2..76cfc29df 100755 --- a/.gitignore +++ b/.gitignore @@ -59,8 +59,7 @@ linkmap.txt .Spotlight-V100 .Trashes Icon? -ehthumbs.db -Thumbs.db +*.db # Android project files # ######################### @@ -76,3 +75,4 @@ engine/compilers/android-studio/local.properties engine/compilers/android-studio/app/src/main/obj/ engine/compilers/android-studio/app/src/main/libs/ engine/compilers/android-studio/app/src/main/game/ +engine/compilers/android-studio/app/.externalNativeBuild/ diff --git a/Leap.dll b/Leap.dll deleted file mode 100644 index 8a6ed2e39..000000000 Binary files a/Leap.dll and /dev/null differ diff --git a/Leapd.dll b/Leapd.dll deleted file mode 100644 index e1bede7bf..000000000 Binary files a/Leapd.dll and /dev/null differ diff --git a/README.md b/README.md index f27cb58e3..d640a0086 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png) -## Torque 2D 3.3 +## Torque 2D 3.4 MIT Licensed Open Source version of Torque 2D from GarageGames. Maintained by the T2D Steering Committee and contributions from the community. @@ -7,9 +7,9 @@ Dedicated to 2D game development, Torque 2D is an extremely powerful, flexible, ### Branches -Here is an overview of the branches found in the Torque 2D repository: +Here is an overview of the branches found in the Torque 2D repository: -* **master:** this branch contains the current stable release code that can be used in a production environment. +* **master:** this branch contains the current stable release code that can be used in a production environment. * **development:** this branch is dedicated to active development. It contains the latest bug fixes, new features, and other updates. All pull requests need to go to the development branch. While we try our best to test all incoming changes, it is possible for mistakes to slip in therefore this branch should always be considered unstable. * **gh-pages:** this branch currently contains the html pages generated from doxygen for the engine and TorqueScript references. @@ -21,19 +21,17 @@ If you do not wish to compile the source code yourself, precompiled binary files After downloading a copy of the source code, the following project files for each platform are provided for you and can be found in the `engine/compilers` folder. -* **Windows:** Visual Studio 2013 or 2015 (works with the free, "Express for Windows Desktop" version) +* **Windows:** Visual Studio 2017 (works with the free Community Edition) * **OSX:** Xcode * **Linux:** Make * **iOS:** Xcode_iOS -* **Android:** Eclipse or Android Studio +* **Android:** Android Studio * **Web:** Emscripten/Cmake See the [wiki](https://github.com/GarageGames/Torque2D/wiki) for available guides on platform setup and development. ### Batteries Included -![truck](http://t2dtutorials.com/img/Truck.png) - Running Torque 2D for the first time out of the box will start you off in the Sandbox. The Sandbox is a collection of over 30 simple "toys" (or modules) which demonstrate various features in T2D. The default toy is a side scrolling level with a monster truck. To see a list of the available modules/toys to choose from, click on the `Show Tools` button in the lower right corner of the screen. Naturally all of the script code and assets for each toy are available to you in the modules folder to use as practical examples while learning T2D. @@ -46,7 +44,11 @@ All documentation for the open source version of Torque 2D can be found on our [ ### Community -Don't go it alone! Join the active community around Torque 2D at GarageGames.com. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork. +Don't go it alone! Join the active Torque community. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork. + +* [Torque 2D Forums on the Torque 3D Website](https://forums.torque3d.org/viewforum.php?f=31) + +You also might be able to find useful information on the less active GarageGames website. * [Torque 2D Beginner Forum](http://www.garagegames.com/community/forums/84) * [Torque 2D Professional Forum](http://www.garagegames.com/community/forums/85) diff --git a/engine/compilers/Make/Torque2D b/engine/compilers/Make/Torque2D index 10c0295db..2094aa86f 100644 --- a/engine/compilers/Make/Torque2D +++ b/engine/compilers/Make/Torque2D @@ -56,7 +56,15 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \ ../../source/assets/assetTagsManifest.cc \ ../../source/assets/declaredAssets.cc \ ../../source/assets/referencedAssets.cc \ + ../../source/audio/audio.cc \ + ../../source/audio/audioDataBlock.cc \ + ../../source/audio/audioDescriptions.cc \ + ../../source/audio/audio_ScriptBinding.cc \ + ../../source/audio/audioStreamSourceFactory.cc \ + ../../source/audio/wavStreamSource.cc \ ../../source/audio/AudioAsset.cc \ + ../../source/audio/audioBuffer.cc \ + ../../source/audio/vorbisStreamSource.cc \ ../../source/bitmapFont/BitmapFont.cc \ ../../source/bitmapFont/BitmapFontCharacter.cc \ ../../source/Box2D/Collision/b2BroadPhase.cpp \ @@ -175,6 +183,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \ ../../source/gui/language/lang.cc \ ../../source/gui/messageVector.cc \ ../../source/input/actionMap.cc \ + ../../source/io/byteBuffer.cpp \ ../../source/io/bitStream.cc \ ../../source/io/bufferStream.cc \ ../../source/io/fileObject.cc \ @@ -241,13 +250,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \ ../../source/persistence/tinyXML/tinyxml.cpp \ ../../source/persistence/tinyXML/tinyxmlerror.cpp \ ../../source/persistence/tinyXML/tinyxmlparser.cpp \ - ../../source/audio/vorbisStreamSource.cc \ - ../../source/audio/audio.cc \ - ../../source/audio/audioBuffer.cc \ - ../../source/audio/audioDataBlock.cc \ - ../../source/audio/audio_ScriptBinding.cc \ - ../../source/audio/audioStreamSourceFactory.cc \ - ../../source/audio/wavStreamSource.cc \ ../../source/component/dynamicConsoleMethodComponent.cpp \ ../../source/component/simComponent.cpp \ ../../source/component/behaviors/behaviorComponent.cpp \ @@ -299,10 +301,11 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \ ../../source/platform/platformFileIO.cc \ ../../source/platform/platformFont.cc \ ../../source/platform/platformMemory.cc \ - ../../source/platform/platformNetwork_ScriptBinding.cc \ + ../../source/platform/platformNet.cpp \ + ../../source/platform/platformNetAsync.cpp \ + ../../source/platform/platformNet_ScriptBinding.cc \ ../../source/platform/platformString.cc \ ../../source/platform/platformVideo.cc \ - ../../source/platform/platformNetAsync.unix.cc \ ../../source/platform/menus/popupMenu.cc \ ../../source/platform/nativeDialogs/msgBox.cpp \ ../../source/platform/Tickable.cc \ @@ -320,7 +323,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \ ../../source/platformX86UNIX/x86UNIXMemory.cc \ ../../source/platformX86UNIX/x86UNIXMessageBox.cc \ ../../source/platformX86UNIX/x86UNIXMutex.cc \ - ../../source/platformX86UNIX/x86UNIXNet.cc \ ../../source/platformX86UNIX/x86UNIXOGLVideo.cc \ ../../source/platformX86UNIX/x86UNIXOpenAL.cc \ ../../source/platformX86UNIX/x86UNIXProcessControl.cc \ diff --git a/engine/compilers/Make/ljpeg b/engine/compilers/Make/ljpeg index 2d28c3be9..b6965e5c9 100644 --- a/engine/compilers/Make/ljpeg +++ b/engine/compilers/Make/ljpeg @@ -1,5 +1,5 @@ # I release this sample under the MIT license: free for any use, provided -# you hold me harmless from any such use you make, and you retain my +# you hold me harmless from any such use you make, and you retain my # copyright on the actual sources. # Copyright 2005 Jon Watte. @@ -79,27 +79,27 @@ LIB_TARGETS_DEBUG += $(TARGET_ljpeg_DEBUG) OBJS_ljpeg := $(patsubst ../../lib/ljpeg/%,Release/ljpeg/%.o,$(SOURCES)) OBJS_ljpeg_DEBUG := $(patsubst ../../lib/ljpeg/%,Debug/ljpeg/%.o,$(SOURCES)) -# Deriving the variable name from the target name is the secret sauce +# Deriving the variable name from the target name is the secret sauce # of the build system. # $(TARGET_ljpeg): $(OBJS_ljpeg) - @echo Linking library ljpng + @echo Linking library ljpng @mkdir -p $(dir $@) ar cr $@ $(OBJS_ljpeg) - + $(TARGET_ljpeg_DEBUG): $(OBJS_ljpeg_DEBUG) - @echo Linking debug library ljpng + @echo Linking debug library ljpng @mkdir -p $(dir $@) ar cr $@ $(OBJS_ljpeg_DEBUG) Release/ljpeg/%.o: ../../lib/ljpeg/% @mkdir -p $(dir $@) $(CC) -c $(CFLAGS_ljpeg) $< -o $@ - + Debug/ljpeg/%.o: ../../lib/ljpeg/% @mkdir -p $(dir $@) $(CC) -c $(CFLAGS_DEBUG_ljpeg) $< -o $@ - + release_ljpeg: $(TARGET_ljpeg) debug_ljpeg: $(TARGET_ljpeg_DEBUG) diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj deleted file mode 100644 index 4e4fb0d4c..000000000 --- a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj +++ /dev/null @@ -1,1310 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Shipping - Win32 - - - - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9} - TorqueGame - Torque2D - - - - Application - false - v120 - - - Application - false - v120 - - - Application - false - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ../../../ - ../../Link/VC2012.$(Configuration).$(PlatformName)/$(ProjectName)/ - - - ../../../ - ../../../ - ../../Link/VC2012.$(Configuration).$(PlatformName)/$(ProjectName)/ - ../../Link/VC2012.$(Configuration).$(PlatformName)/$(ProjectName)/ - false - false - Torque2D_DEBUG - Torque2D - Torque2D - - - - $(OutDir)Torque2D.tlb - - - - - Disabled - ../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories) - TORQUE_DEBUG;TORQUE_DEBUG_GUARD;_CRT_SECURE_NO_DEPRECATE;UNICODE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreaded - false - true - - - $(OutDir) - $(IntDir)$(ProjectName).pdb - false - true - EditAndContinue - CompileAsCpp - true - Level3 - 4800;4100;4127;4512 - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - - - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;RPCRT4.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;%(AdditionalDependencies) - ../../../Torque2D_DEBUG.exe - true - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) - LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) - true - $(IntDir)$(ProjectName).pdb - Windows - false - - - MachineX86 - false - - - - - $(OutDir)Torque2D.tlb - - - - - MinSpace - OnlyExplicitInline - ../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories) - UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - $(OutDir) - $(IntDir)$(ProjectName).pdb - false - Level3 - true - ProgramDatabase - CompileAsCpp - true - 4800;4100;4127;4512 - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - - - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) - ../../../Torque2D.exe - false - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) - LIBC;%(IgnoreSpecificDefaultLibraries) - true - $(IntDir)$(ProjectName).pdb - Windows - false - - - MachineX86 - false - HighestAvailable - false - - - - - - - - - - - - - - $(OutDir)Torque2D.tlb - - - - - MinSpace - OnlyExplicitInline - ../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../Source;../../Source/persistence/rapidjson/include;../../Source/persistence/libjson;%(AdditionalIncludeDirectories) - TORQUE_SHIPPING;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - $(OutDir) - $(IntDir)$(ProjectName).pdb - false - Level3 - true - ProgramDatabase - CompileAsCpp - true - 4800;4100;4127;4512 - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - - - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) - ../../../Torque2D.exe - false - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) - LIBC;%(IgnoreSpecificDefaultLibraries) - false - $(IntDir)$(ProjectName).pdb - Windows - false - - - MachineX86 - false - HighestAvailable - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - "$(SolutionDir)..\..\Bin\nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj" - $(IntDir)%(Filename).obj;%(Outputs) - $(IntDir)%(Filename).obj;%(Outputs) - - - - - {15cbfeff-7965-41f5-b4e2-21e8795c9159} - false - false - false - true - false - - - {3a214e06-b95e-4d61-a291-1f8df2ec10fd} - false - false - false - true - false - - - {0b07ba94-aa53-4fd4-adb4-79ec2da53b36} - false - - - {af1179e3-a838-46a3-a427-1e62aa4c52f4} - false - - - {86cb2525-0cf3-40d3-bf42-a0a95035ee8c} - false - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters deleted file mode 100644 index 3787194a3..000000000 --- a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters +++ /dev/null @@ -1,3219 +0,0 @@ - - - - - {b90d3c2c-9694-4051-8b22-325c00d37951} - - - {57099cfd-2f9b-468f-88a5-df769a6235b0} - - - {8b011278-0d15-4ba9-ba57-24056b918233} - - - {b0a55e16-3a1f-4eb5-8f5b-3396d456be74} - - - {71933100-a4a2-464e-bb3f-bb04d9f078af} - - - {7824869e-4359-4413-a615-38c8534d641b} - - - {baaa5934-0805-46eb-be6e-ae5643535b4b} - - - {6a14bfc6-1f7c-4527-91d3-ccf897ff4002} - - - {bfd4849e-66c6-450b-9a01-0873aa28e21a} - - - {1f640da6-77a4-4176-a018-9bfad5becf95} - - - {4faf4110-842d-4178-81ca-0375f3804cac} - - - {2f939a2b-3cd9-4e67-8311-bf751093f2a5} - - - {84907fc2-76e8-4a3b-9df4-76451387d3f9} - - - {e2574a74-ff0d-401d-818d-96e6c155a4b4} - - - {18c9fe85-da18-45d5-9573-a71ce9373961} - - - {4f9157b1-a024-450f-a352-1849cf2bddcc} - - - {14385fbb-f8af-4849-bdd9-8c8f67d3928e} - - - {9ec04d21-b122-45be-bd70-2869fa9cdd8e} - - - {09cd4b77-b9b4-41f4-b17e-3ac25c27beee} - - - {47a0d755-122c-490b-b11c-d06a74fe2ab2} - - - {ec2d3f1a-e3d1-49d5-98d6-a3084e37d077} - - - {b3b96a6a-462f-4c7d-92a5-009cabbe94a3} - - - {d55ba677-1863-4206-92b7-1df94c48df84} - - - {d016b107-aefd-41ac-a04c-6b75caaf114d} - - - {d48f2bd5-39e5-4fdb-8472-79839fcd7e21} - - - {187e7671-960f-49a7-898b-a10cf5900751} - - - {c17330c5-953e-4e71-9acb-1b7806b3c932} - - - {92e20c7c-410f-4df4-a9b9-7662dac44699} - - - {513dc4d3-ba16-414a-8576-16b1dba4f6e8} - - - {c48781cd-5e6a-4ffe-b866-e64582f00d6d} - - - {eee14c00-6a21-4fa8-9339-572a11819062} - - - {fcfa64cc-dd46-41c1-9ada-8b4a15051285} - - - {fa588b4f-a8dd-4615-beee-dab4db372118} - - - {27eea104-6e41-4cfb-bc50-56f9157081ce} - - - {0688e2d7-d313-4a35-b90d-1df191825361} - - - {04e382a2-a0a9-40c9-b227-a46e345fb032} - - - {5c7d23f1-7194-4a6f-8bd3-fd5b6a0beb4f} - - - {66757e8b-c204-4b92-92ab-19278019d17d} - - - {23024162-0d6f-4259-8dac-a3a621d55065} - - - {c1b891be-db08-48e9-b52a-f0cf3bac185e} - - - {87703b23-784c-4769-b085-57c72b1b536e} - - - {a2568a68-f396-4b3e-9ed6-bf73656752d3} - - - {d13f86bc-f4dd-4329-8337-dd41e2db04a1} - - - {f5858e14-ed7e-4887-a22e-4123ab41a6f1} - - - {a9dbe516-9ed6-43a6-987e-6f2bc6f59928} - - - {d98ec67b-b10a-4c7b-bb2f-a6394a861b67} - - - {04d21b23-41a0-44a7-810e-f31c81fd5c81} - - - {3f7e4a0c-c3da-4972-a9bc-9cb0e0ce622e} - - - {d77ee12f-a922-4d39-9e6c-2ad87a5b4a4e} - - - {9da3da8f-0660-4a53-b5cf-3994c2dca7e3} - - - {78695f15-84c6-4505-a999-716fe79bdabe} - - - {e706ea06-aa20-4487-a010-e0d00adc658f} - - - {fa7e2f20-cd6d-4118-8a74-9f9c95119064} - - - {7b04617f-42ef-4238-9a98-9d8309b64c93} - - - {57e1271d-4358-4180-b168-4b9c2cbac907} - - - {a9e97335-bed5-4f6a-9959-12f5f41dbdcb} - - - {e11e344e-6418-4ed0-980a-77d66cd64d65} - - - {1eb9e730-583b-4aa4-ac25-b83960799ba4} - - - {30e1ec13-118b-4d50-8e04-76e76fcfdc01} - - - {4d0b6ff3-58d2-4952-bd14-915a50a3b568} - - - {9cbec746-dd4c-4b4c-b11f-37a126ea2c38} - - - {427672e0-f4a2-45a9-b44c-92d190e961aa} - - - {e1ff3412-7343-4dfb-bc99-bce90655557b} - - - {cc1c1416-376b-4686-a4ac-21d1a35c9390} - - - {addcb993-5059-42bf-a1ea-871f700c67c3} - - - {bb776838-ed6f-477c-b366-dd0c5c60ae5f} - - - {f2c8da8c-5c32-48ef-b5ab-0b27a9fe28d3} - - - - - audio - - - audio - - - audio - - - audio - - - audio - - - component - - - component - - - component\behaviors - - - component\behaviors - - - component\behaviors - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - game - - - game - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - persistence - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform\menus - - - platform\nativeDialogs - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32\menus - - - platformWin32\nativeDialogs - - - platformWin32\nativeDialogs - - - platformWin32\threads - - - platformWin32\threads - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Rope - - - persistence\taml - - - module - - - module - - - persistence\tinyXML - - - persistence\tinyXML - - - persistence\tinyXML - - - persistence\tinyXML - - - module - - - assets - - - assets - - - assets - - - assets - - - assets - - - gui\language - - - graphics - - - graphics - - - graphics - - - graphics - - - graphics - - - graphics - - - graphics - - - graphics - - - messaging - - - messaging - - - messaging - - - messaging - - - messaging - - - game - - - debug - - - math - - - input - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - graphics - - - collection - - - collection - - - collection - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - memory - - - algorithm - - - algorithm - - - game - - - sim - - - sim - - - sim - - - sim - - - sim - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - string - - - string - - - string - - - string - - - string - - - io\resource - - - io\resource - - - collection - - - collection - - - platform - - - network - - - debug - - - string - - - network - - - network - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - console - - - console - - - console - - - console - - - console - - - audio - - - graphics - - - graphics - - - graphics - - - graphics - - - persistence\taml - - - delegates - - - 2d\assets - - - 2d\assets - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\gui - - - 2d\gui - - - 2d\gui - - - 2d\core - - - 2d\scene - - - 2d\scene - - - 2d\gui - - - debug\remote - - - debug\remote - - - debug\remote - - - graphics - - - platform - - - network - - - testing\tests - - - testing - - - testing\tests - - - testing\tests - - - platform\nativeDialogs - - - platformWin32\nativeDialogs - - - graphics - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\sceneobject - - - 2d\core - - - assets - - - assets - - - persistence\taml - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\controllers - - - 2d\controllers - - - 2d\controllers\core - - - 2d\controllers\core - - - 2d\controllers - - - 2d\core - - - 2d\experimental\composites - - - 2d\core - - - 2d\core - - - persistence\taml\binary - - - persistence\taml\binary - - - persistence\taml\json - - - persistence\taml\json - - - persistence\taml\xml - - - persistence\taml\xml - - - persistence\taml\xml - - - persistence\taml\json - - - gui\containers - - - console - - - audio - - - io - - - math - - - platform - - - memory - - - console - - - input\leapMotion - - - input\leapMotion - - - math - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - 2d\assets - - - 2d\sceneobject - - - audio - - - 2d\assets - - - bitmapFont - - - 2d\sceneobject - - - bitmapFont - - - audio - - - - - audio - - - audio - - - audio - - - audio - - - audio - - - audio - - - component - - - component - - - component\behaviors - - - component\behaviors - - - component\behaviors - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - console - - - game - - - game - - - game - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - persistence - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform\menus - - - platform\nativeDialogs - - - platform\nativeDialogs - - - platform\threads - - - platform\threads - - - platform\threads - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - platformWin32\nativeDialogs - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\buttons - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\containers - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - gui\editor - - - Box2D - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Collision\Shapes - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Common - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Contacts - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Dynamics\Joints - - - Box2D\Rope - - - component\behaviors - - - component\behaviors - - - component\behaviors - - - component\behaviors - - - persistence\taml - - - persistence\taml - - - persistence\taml - - - module - - - module - - - module - - - persistence\tinyXML - - - persistence\tinyXML - - - module - - - module - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - assets - - - module - - - module - - - assets - - - assets - - - gui\language - - - graphics - - - graphics - - - graphics - - - graphics - - - messaging - - - messaging - - - messaging - - - messaging - - - messaging - - - game - - - debug - - - math - - - input - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - gui - - - graphics - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - collection - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - io\zip - - - memory - - - memory - - - collection - - - collection - - - algorithm - - - algorithm - - - algorithm - - - graphics - - - collection - - - game - - - sim - - - sim - - - sim - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - network - - - string - - - string - - - string - - - string - - - string - - - memory - - - io\resource - - - memory - - - collection - - - collection - - - collection - - - platform - - - network - - - debug - - - string - - - network - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - sim - - - console - - - console - - - console - - - console - - - console - - - console - - - audio - - - graphics - - - graphics - - - graphics - - - graphics - - - graphics - - - persistence\taml - - - delegates - - - delegates - - - delegates - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\core - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - 2d\gui - - - 2d\gui - - - 2d\gui - - - 2d\gui - - - 2d\gui - - - 2d\core - - - 2d\scene - - - 2d\scene - - - 2d\scene - - - algorithm - - - 2d\gui - - - 2d\gui - - - debug\remote - - - debug\remote - - - debug\remote - - - debug\remote - - - debug\remote - - - debug\remote - - - graphics - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - game - - - network - - - testing - - - platform - - - platform - - - platformWin32 - - - persistence\taml - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\assets - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\assets - - - 2d\core - - - assets - - - assets - - - persistence\taml - - - sim - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\sceneobject - - - 2d\controllers - - - 2d\controllers - - - 2d\controllers - - - 2d\controllers - - - 2d\controllers\core - - - 2d\controllers\core - - - 2d\controllers\core - - - 2d\controllers\core - - - 2d\controllers\core - - - 2d\controllers - - - 2d\controllers - - - 2d\core - - - 2d\core - - - 2d\experimental\composites - - - 2d\experimental\composites - - - 2d\core - - - 2d\core - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson - - - persistence\rapidjson\internal - - - persistence\rapidjson\internal - - - persistence\rapidjson\internal - - - persistence\taml\binary - - - persistence\taml\binary - - - persistence\taml\json - - - persistence\taml\json - - - persistence\taml\xml - - - persistence\taml\xml - - - persistence\taml\xml - - - persistence\taml - - - persistence\taml - - - persistence\taml\json - - - gui\containers - - - sim - - - input - - - gui - - - platform - - - string - - - console - - - platform - - - game - - - console - - - graphics - - - sim - - - sim - - - persistence - - - messaging - - - io - - - platform\nativeDialogs - - - console - - - network - - - game - - - platform\menus - - - io - - - collection - - - console - - - messaging - - - math - - - math - - - math - - - math - - - component - - - component - - - io - - - network - - - messaging - - - network - - - network - - - sim - - - graphics - - - console - - - graphics - - - network - - - platform - - - platform - - - debug - - - debug - - - network - - - network - - - io\resource - - - graphics - - - - platformWin32 - - - network - - - console - - - console - - - console - - - platform - - - graphics - - - graphics - - - platformWin32 - - - platformWin32 - - - 2d\core - - - platformWin32 - - - platformWin32 - - - platformWin32 - - - network - - - network - - - network - - - testing - - - platform\nativeDialogs - - - sim - - - platformWin32 - - - string - - - io\zip - - - gui - - - console - - - input\leapMotion - - - input\leapMotion - - - input\leapMotion - - - input\leapMotion - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - spine - - - 2d\assets - - - 2d\assets - - - 2d\sceneobject - - - 2d\sceneobject - - - audio - - - platformWin32 - - - 2d\assets - - - 2d\assets - - - bitmapFont - - - bitmapFont - - - 2d\sceneobject - - - 2d\sceneobject - - - bitmapFont - - - bitmapFont - - - audio - - - - - math - - - math - - - math - - - platform - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2013/lpng.vcxproj b/engine/compilers/VisualStudio 2013/lpng.vcxproj deleted file mode 100644 index eab6dc496..000000000 --- a/engine/compilers/VisualStudio 2013/lpng.vcxproj +++ /dev/null @@ -1,186 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Shipping - Win32 - - - - {AF1179E3-A838-46A3-A427-1E62AA4C52F4} - - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\../../Link/Debug\ - .\../../Link/Debug/lpng\ - .\../../Link/Release\ - .\../../Link/Release\ - .\../../Link/Release/lpng\ - .\../../Link/Release/lpng\ - $(ProjectName)_DEBUG - - - - Disabled - ..\..\Lib\lpng;..\..\Lib\zlib;%(AdditionalIncludeDirectories) - TORQUE_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - .\../../Link/Debug/lpng/lpng.pch - .\../../Link/Debug/lpng/ - .\../../Link/Debug/lpng/ - .\../../Link/Debug/lpng/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\Lib\lpng;..\..\Lib\zlib;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/lpng/lpng.pch - .\../../Link/Release/lpng/ - .\../../Link/Release/lpng/ - .\../../Link/Release/lpng/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\lpng.lib - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\Lib\lpng;..\..\Lib\zlib;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/lpng/lpng.pch - .\../../Link/Release/lpng/ - .\../../Link/Release/lpng/ - .\../../Link/Release/lpng/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\lpng.lib - true - - - - - {86cb2525-0cf3-40d3-bf42-a0a95035ee8c} - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2013/zlib.vcxproj b/engine/compilers/VisualStudio 2013/zlib.vcxproj deleted file mode 100644 index a3ce0de43..000000000 --- a/engine/compilers/VisualStudio 2013/zlib.vcxproj +++ /dev/null @@ -1,184 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Shipping - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C} - - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\../../Link/Debug\ - .\../../Link/Debug/zlib\ - .\../../Link/Release\ - .\../../Link/Release\ - .\../../Link/Release/zlib\ - .\../../Link/Release/zlib\ - $(ProjectName)_DEBUG - - - - Disabled - zlib;%(AdditionalIncludeDirectories) - TORQUE_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - .\../../Link/Debug/zlib/zlib.pch - .\../../Link/Debug/zlib/ - .\../../Link/Debug/zlib/ - .\../../Link/Debug/zlib/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - - - MaxSpeed - OnlyExplicitInline - zlib;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/zlib/zlib.pch - .\../../Link/Release/zlib/ - .\../../Link/Release/zlib/ - .\../../Link/Release/zlib/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\zlib.lib - true - - - - - MaxSpeed - OnlyExplicitInline - zlib;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/zlib/zlib.pch - .\../../Link/Release/zlib/ - .\../../Link/Release/zlib/ - .\../../Link/Release/zlib/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\zlib.lib - true - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/Torque 2D.ico b/engine/compilers/VisualStudio 2015/Torque 2D.ico deleted file mode 100644 index e256ced56..000000000 Binary files a/engine/compilers/VisualStudio 2015/Torque 2D.ico and /dev/null differ diff --git a/engine/compilers/VisualStudio 2015/Torque 2D.rc b/engine/compilers/VisualStudio 2015/Torque 2D.rc deleted file mode 100644 index b68f5924d..000000000 --- a/engine/compilers/VisualStudio 2015/Torque 2D.rc +++ /dev/null @@ -1,110 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "../../Source/game/resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "windows.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_TORQUE2D ICON DISCARDABLE "Torque 2D.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,0 - PRODUCTVERSION 2,0,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "GarageGames LLC" - VALUE "FileDescription", "Torque 2D MIT" - VALUE "FileVersion", "2, 0, 0, 0" - VALUE "InternalName", "Torque 2D" - VALUE "LegalCopyright", "Copyright (c) 2013 GarageGames, LLC" - VALUE "OriginalFilename", "Torque2D.exe" - VALUE "ProductName", "Torque 2D MIT" - VALUE "ProductVersion", "2, 0, 0, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/engine/compilers/VisualStudio 2015/Torque 2D.sln b/engine/compilers/VisualStudio 2015/Torque 2D.sln deleted file mode 100644 index c471ab8ac..000000000 --- a/engine/compilers/VisualStudio 2015/Torque 2D.sln +++ /dev/null @@ -1,98 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Torque2D", "Torque 2D.vcxproj", "{1564A07D-230E-4C90-AEE6-52AC9A58D6C9}" - ProjectSection(ProjectDependencies) = postProject - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} - {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ljpeg", "ljpeg.vcxproj", "{0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpng", "lpng.vcxproj", "{AF1179E3-A838-46A3-A427-1E62AA4C52F4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{86CB2525-0CF3-40D3-BF42-A0A95035EE8C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "libvorbis.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}" - ProjectSection(ProjectDependencies) = postProject - {15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - Shipping|Win32 = Shipping|Win32 - Shipping|x64 = Shipping|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Debug|Win32.Build.0 = Debug|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Debug|x64.ActiveCfg = Debug|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Release|Win32.ActiveCfg = Release|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Release|Win32.Build.0 = Release|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Release|x64.ActiveCfg = Release|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Shipping|Win32.Build.0 = Shipping|Win32 - {1564A07D-230E-4C90-AEE6-52AC9A58D6C9}.Shipping|x64.ActiveCfg = Shipping|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Debug|Win32.Build.0 = Debug|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Debug|x64.ActiveCfg = Debug|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Release|Win32.ActiveCfg = Release|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Release|Win32.Build.0 = Release|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Release|x64.ActiveCfg = Release|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Shipping|Win32.Build.0 = Shipping|Win32 - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36}.Shipping|x64.ActiveCfg = Shipping|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Debug|Win32.Build.0 = Debug|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Debug|x64.ActiveCfg = Debug|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Release|Win32.ActiveCfg = Release|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Release|Win32.Build.0 = Release|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Release|x64.ActiveCfg = Release|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Shipping|Win32.Build.0 = Shipping|Win32 - {AF1179E3-A838-46A3-A427-1E62AA4C52F4}.Shipping|x64.ActiveCfg = Shipping|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Debug|Win32.ActiveCfg = Debug|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Debug|Win32.Build.0 = Debug|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Debug|x64.ActiveCfg = Debug|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Release|Win32.ActiveCfg = Release|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Release|Win32.Build.0 = Release|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Release|x64.ActiveCfg = Release|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Shipping|Win32.Build.0 = Shipping|Win32 - {86CB2525-0CF3-40D3-BF42-A0A95035EE8C}.Shipping|x64.ActiveCfg = Shipping|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.ActiveCfg = Debug|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.Build.0 = Debug|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.ActiveCfg = Debug|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.Build.0 = Debug|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.ActiveCfg = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.Build.0 = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.ActiveCfg = Release|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.Build.0 = Release|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Shipping|Win32.ActiveCfg = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Shipping|Win32.Build.0 = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Shipping|x64.ActiveCfg = Release|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Shipping|x64.Build.0 = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.Build.0 = Debug|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.ActiveCfg = Debug|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.Build.0 = Debug|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.ActiveCfg = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.Build.0 = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.ActiveCfg = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.Build.0 = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Shipping|Win32.ActiveCfg = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Shipping|Win32.Build.0 = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Shipping|x64.ActiveCfg = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Shipping|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/engine/compilers/VisualStudio 2015/libogg.vcxproj b/engine/compilers/VisualStudio 2015/libogg.vcxproj deleted file mode 100644 index b007c4dc7..000000000 --- a/engine/compilers/VisualStudio 2015/libogg.vcxproj +++ /dev/null @@ -1,181 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - {15CBFEFF-7965-41F5-B4E2-21E8795C9159} - libogg - Win32Proj - - - - StaticLibrary - Unicode - false - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\../../Link/Debug\ - .\../../Link/Debug/libogg\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\../../Link/Release\ - .\../../Link/Release/libogg\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(ProjectName)_DEBUG - - - - Disabled - ..\..\Lib\libogg\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - CompileAsC - Cdecl - .\../../Link/Debug/libogg/ - .\../../Link/Debug/libogg/ - .\../../Link/Debug/libogg/ - .\../../Link/Debug/lpng/libogg.pch - - - - - X64 - - - Disabled - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level4 - ProgramDatabase - CompileAsC - Cdecl - - - - - MaxSpeed - AnySuitable - true - Speed - ..\..\Lib\libogg\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreaded - false - - - Level3 - - - CompileAsC - 4244;%(DisableSpecificWarnings) - Cdecl - .\../../Link/Release/libogg/ - .\../../Link/Release/libogg/ - .\../../Link/Release/libogg/ - - - - - X64 - - - MaxSpeed - AnySuitable - true - Speed - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreaded - false - - - Level4 - - - CompileAsC - 4244;%(DisableSpecificWarnings) - Cdecl - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/libvorbis.vcxproj b/engine/compilers/VisualStudio 2015/libvorbis.vcxproj deleted file mode 100644 index d61aaf010..000000000 --- a/engine/compilers/VisualStudio 2015/libvorbis.vcxproj +++ /dev/null @@ -1,243 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} - libvorbis - Win32Proj - - - - StaticLibrary - Unicode - false - v140 - - - StaticLibrary - Unicode - v140 - - - StaticLibrary - Unicode - true - v140 - - - StaticLibrary - Unicode - v140 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\../../Link/Debug\ - .\../../Link/Debug/libvorbis\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - .\../../Link/Release\ - .\../../Link/Release/libvorbis\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - $(ProjectName)_DEBUG - - - - Disabled - ..\..\Lib\libvorbis\lib;..\..\Lib\libvorbis\include;..\..\Lib\libogg\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - CompileAsC - Cdecl - .\../../Link/Debug/libvorbis/ - .\../../Link/Debug/libvorbis/ - .\../../Link/Debug/libvorbis/ - .\../../Link/Debug/lpng/libvorbis.pch - - - - - X64 - - - Disabled - ..\..\..\include;..\..\..\..\libogg\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - CompileAsC - Cdecl - - - - - Full - AnySuitable - true - Speed - ..\..\Lib\libvorbis\lib;..\..\Lib\libvorbis\include;..\..\Lib\libogg\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreaded - false - - - Level3 - ProgramDatabase - CompileAsC - 4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings) - Cdecl - .\../../Link/Release/libvorbis/ - .\../../Link/Release/libvorbis/ - .\../../Link/Release/libvorbis/ - - - - - X64 - - - Full - AnySuitable - true - Speed - ..\..\..\include;..\..\..\..\libogg\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - ProgramDatabase - CompileAsC - 4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings) - Cdecl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/ljpeg.vcxproj b/engine/compilers/VisualStudio 2015/ljpeg.vcxproj deleted file mode 100644 index 7936e8833..000000000 --- a/engine/compilers/VisualStudio 2015/ljpeg.vcxproj +++ /dev/null @@ -1,630 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Shipping - Win32 - - - - {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36} - - - - StaticLibrary - false - v140 - - - StaticLibrary - false - v140 - - - StaticLibrary - false - v140 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\../../Link/Release\ - .\../../Link/Release\ - .\../../Link/Release/ljpeg\ - .\../../Link/Release/ljpeg\ - .\../../Link/Debug\ - .\../../Link/Debug/ljpeg\ - $(ProjectName)_DEBUG - - - - MaxSpeed - OnlyExplicitInline - ljpeg;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/ljpeg/ljpeg.pch - .\../../Link/Release/ljpeg/ - .\../../Link/Release/ljpeg/ - .\../../Link/Release/ljpeg/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\ljpeg.lib - true - - - - - MaxSpeed - OnlyExplicitInline - ljpeg;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - true - false - true - - - .\../../Link/Release/ljpeg/ljpeg.pch - .\../../Link/Release/ljpeg/ - .\../../Link/Release/ljpeg/ - .\../../Link/Release/ljpeg/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\../../Link/Release\ljpeg.lib - true - - - - - Disabled - ljpeg;%(AdditionalIncludeDirectories) - TORQUE_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - .\../../Link/Debug/ljpeg/ljpeg.pch - .\../../Link/Debug/ljpeg/ - .\../../Link/Debug/ljpeg/ - .\../../Link/Debug/ljpeg/ - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - EnableFastChecks - MaxSpeed - MaxSpeed - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/ljpeg.vcxproj.filters b/engine/compilers/VisualStudio 2015/ljpeg.vcxproj.filters deleted file mode 100644 index e7df8bc60..000000000 --- a/engine/compilers/VisualStudio 2015/ljpeg.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/lpng.vcxproj.filters b/engine/compilers/VisualStudio 2015/lpng.vcxproj.filters deleted file mode 100644 index dd7259716..000000000 --- a/engine/compilers/VisualStudio 2015/lpng.vcxproj.filters +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2015/zlib.vcxproj.filters b/engine/compilers/VisualStudio 2015/zlib.vcxproj.filters deleted file mode 100644 index 5795e3953..000000000 --- a/engine/compilers/VisualStudio 2015/zlib.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db b/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db new file mode 100644 index 000000000..2f143812c Binary files /dev/null and b/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db differ diff --git a/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Solution.VC.db b/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Solution.VC.db new file mode 100644 index 000000000..235f8b75f Binary files /dev/null and b/engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Solution.VC.db differ diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.ico b/engine/compilers/VisualStudio 2017/Torque 2D.ico similarity index 100% rename from engine/compilers/VisualStudio 2013/Torque 2D.ico rename to engine/compilers/VisualStudio 2017/Torque 2D.ico diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.rc b/engine/compilers/VisualStudio 2017/Torque 2D.rc similarity index 100% rename from engine/compilers/VisualStudio 2013/Torque 2D.rc rename to engine/compilers/VisualStudio 2017/Torque 2D.rc diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.sln b/engine/compilers/VisualStudio 2017/Torque 2D.sln similarity index 100% rename from engine/compilers/VisualStudio 2013/Torque 2D.sln rename to engine/compilers/VisualStudio 2017/Torque 2D.sln diff --git a/engine/compilers/VisualStudio 2015/Torque 2D.vcxproj b/engine/compilers/VisualStudio 2017/Torque 2D.vcxproj similarity index 97% rename from engine/compilers/VisualStudio 2015/Torque 2D.vcxproj rename to engine/compilers/VisualStudio 2017/Torque 2D.vcxproj index cbe0f6ba5..2bcabb9d8 100644 --- a/engine/compilers/VisualStudio 2015/Torque 2D.vcxproj +++ b/engine/compilers/VisualStudio 2017/Torque 2D.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,22 +18,23 @@ {1564A07D-230E-4C90-AEE6-52AC9A58D6C9} TorqueGame Torque2D + 10.0.16299.0 Application false - v140 + v141 Application false - v140 + v141 Application false - v140 + v141 @@ -100,10 +101,10 @@ ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;RPCRT4.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;%(AdditionalDependencies) + COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;RPCRT4.LIB;WINMM.LIB;WS2_32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;%(AdditionalDependencies) ../../../Torque2D_DEBUG.exe true - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) + ../../Lib/unicode;../../lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) true $(IntDir)$(ProjectName).pdb @@ -149,10 +150,10 @@ ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) + COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WS2_32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) ../../../Torque2D.exe false - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) + ../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) LIBC;%(IgnoreSpecificDefaultLibraries) true $(IntDir)$(ProjectName).pdb @@ -209,10 +210,10 @@ ../../Lib/MSPlatformSDK/Include;%(AdditionalIncludeDirectories) - Leap.lib;COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) + COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WS2_32.LIB;vfw32.lib;Imm32.lib;shell32.lib;shlwapi.lib;ole32.lib;RPCRT4.LIB;%(AdditionalDependencies) ../../../Torque2D.exe false - ../../lib/LeapSDK/lib/x86;../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) + ../../Lib/unicode;../../Lib/MSPlatformSDK/Lib;%(AdditionalLibraryDirectories) LIBC;%(IgnoreSpecificDefaultLibraries) false $(IntDir)$(ProjectName).pdb @@ -418,10 +419,9 @@ - - + @@ -539,7 +539,9 @@ - + + + @@ -559,7 +561,6 @@ - @@ -929,12 +930,9 @@ - - - - + @@ -942,6 +940,7 @@ + @@ -961,6 +960,7 @@ + @@ -1114,7 +1114,8 @@ - + + @@ -1125,6 +1126,8 @@ + + @@ -1157,6 +1160,7 @@ + diff --git a/engine/compilers/VisualStudio 2015/Torque 2D.vcxproj.filters b/engine/compilers/VisualStudio 2017/Torque 2D.vcxproj.filters similarity index 98% rename from engine/compilers/VisualStudio 2015/Torque 2D.vcxproj.filters rename to engine/compilers/VisualStudio 2017/Torque 2D.vcxproj.filters index 57f721440..456306428 100644 --- a/engine/compilers/VisualStudio 2015/Torque 2D.vcxproj.filters +++ b/engine/compilers/VisualStudio 2017/Torque 2D.vcxproj.filters @@ -193,9 +193,6 @@ {cc1c1416-376b-4686-a4ac-21d1a35c9390} - - {addcb993-5059-42bf-a1ea-871f700c67c3} - {bb776838-ed6f-477c-b366-dd0c5c60ae5f} @@ -405,9 +402,6 @@ platformWin32 - - platformWin32 - platformWin32 @@ -1335,21 +1329,12 @@ math - - platform - memory console - - input\leapMotion - - - input\leapMotion - math @@ -1443,6 +1428,10 @@ audio + + + + @@ -2639,9 +2628,6 @@ platform - - platform - platform @@ -3072,18 +3058,6 @@ console - - input\leapMotion - - - input\leapMotion - - - input\leapMotion - - - input\leapMotion - spine @@ -3198,6 +3172,14 @@ audio + + + + + + + + diff --git a/engine/compilers/VisualStudio 2013/libogg.vcxproj b/engine/compilers/VisualStudio 2017/libogg.vcxproj similarity index 96% rename from engine/compilers/VisualStudio 2013/libogg.vcxproj rename to engine/compilers/VisualStudio 2017/libogg.vcxproj index 38413380d..140685ce8 100644 --- a/engine/compilers/VisualStudio 2013/libogg.vcxproj +++ b/engine/compilers/VisualStudio 2017/libogg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,29 +30,30 @@ {15CBFEFF-7965-41F5-B4E2-21E8795C9159} libogg Win32Proj + 10.0.16299.0 StaticLibrary Unicode false - v120 + v141 StaticLibrary Unicode - v120 + v141 StaticLibrary Unicode true - v120 + v141 StaticLibrary Unicode - v120 + v141 diff --git a/engine/compilers/VisualStudio 2013/libvorbis.vcxproj b/engine/compilers/VisualStudio 2017/libvorbis.vcxproj similarity index 97% rename from engine/compilers/VisualStudio 2013/libvorbis.vcxproj rename to engine/compilers/VisualStudio 2017/libvorbis.vcxproj index 953276588..bc5213108 100644 --- a/engine/compilers/VisualStudio 2013/libvorbis.vcxproj +++ b/engine/compilers/VisualStudio 2017/libvorbis.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,30 @@ {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} libvorbis Win32Proj + 10.0.16299.0 StaticLibrary Unicode false - v120 + v141 StaticLibrary Unicode - v120 + v141 StaticLibrary Unicode true - v120 + v141 StaticLibrary Unicode - v120 + v141 diff --git a/engine/compilers/VisualStudio 2013/ljpeg.vcxproj b/engine/compilers/VisualStudio 2017/ljpeg.vcxproj similarity index 99% rename from engine/compilers/VisualStudio 2013/ljpeg.vcxproj rename to engine/compilers/VisualStudio 2017/ljpeg.vcxproj index 9cf2e3aed..832b2c5ef 100644 --- a/engine/compilers/VisualStudio 2013/ljpeg.vcxproj +++ b/engine/compilers/VisualStudio 2017/ljpeg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,22 +16,23 @@ {0B07BA94-AA53-4FD4-ADB4-79EC2DA53B36} + 10.0.16299.0 StaticLibrary false - v120 + v141 StaticLibrary false - v120 + v141 StaticLibrary false - v120 + v141 diff --git a/engine/compilers/VisualStudio 2013/ljpeg.vcxproj.filters b/engine/compilers/VisualStudio 2017/ljpeg.vcxproj.filters similarity index 100% rename from engine/compilers/VisualStudio 2013/ljpeg.vcxproj.filters rename to engine/compilers/VisualStudio 2017/ljpeg.vcxproj.filters diff --git a/engine/compilers/VisualStudio 2015/lpng.vcxproj b/engine/compilers/VisualStudio 2017/lpng.vcxproj similarity index 97% rename from engine/compilers/VisualStudio 2015/lpng.vcxproj rename to engine/compilers/VisualStudio 2017/lpng.vcxproj index e149aaf71..f74c2b129 100644 --- a/engine/compilers/VisualStudio 2015/lpng.vcxproj +++ b/engine/compilers/VisualStudio 2017/lpng.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,22 +16,23 @@ {AF1179E3-A838-46A3-A427-1E62AA4C52F4} + 10.0.16299.0 StaticLibrary false - v140 + v141 StaticLibrary false - v140 + v141 StaticLibrary false - v140 + v141 diff --git a/engine/compilers/VisualStudio 2013/lpng.vcxproj.filters b/engine/compilers/VisualStudio 2017/lpng.vcxproj.filters similarity index 100% rename from engine/compilers/VisualStudio 2013/lpng.vcxproj.filters rename to engine/compilers/VisualStudio 2017/lpng.vcxproj.filters diff --git a/engine/compilers/VisualStudio 2013/main.cs b/engine/compilers/VisualStudio 2017/main.cs similarity index 100% rename from engine/compilers/VisualStudio 2013/main.cs rename to engine/compilers/VisualStudio 2017/main.cs diff --git a/engine/compilers/VisualStudio 2015/zlib.vcxproj b/engine/compilers/VisualStudio 2017/zlib.vcxproj similarity index 97% rename from engine/compilers/VisualStudio 2015/zlib.vcxproj rename to engine/compilers/VisualStudio 2017/zlib.vcxproj index 6752af1cd..c845130d2 100644 --- a/engine/compilers/VisualStudio 2015/zlib.vcxproj +++ b/engine/compilers/VisualStudio 2017/zlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -46,22 +46,23 @@ {86CB2525-0CF3-40D3-BF42-A0A95035EE8C} + 10.0.16299.0 StaticLibrary false - v140 + v141 StaticLibrary false - v140 + v141 StaticLibrary false - v140 + v141 diff --git a/engine/compilers/VisualStudio 2013/zlib.vcxproj.filters b/engine/compilers/VisualStudio 2017/zlib.vcxproj.filters similarity index 100% rename from engine/compilers/VisualStudio 2013/zlib.vcxproj.filters rename to engine/compilers/VisualStudio 2017/zlib.vcxproj.filters diff --git a/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj b/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj index 7e8fc34e5..741ec1bb1 100755 --- a/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj +++ b/engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 06D168651C1F90F1009A1AD1 /* libogg.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 06D1685F1C1F90AB009A1AD1 /* libogg.0.dylib */; }; - 06D168661C1F90F1009A1AD1 /* libvorbis.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 06D168601C1F90AB009A1AD1 /* libvorbis.0.dylib */; }; - 06D168671C1F90F1009A1AD1 /* libvorbisfile.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 06D168611C1F90AB009A1AD1 /* libvorbisfile.3.dylib */; }; 06D1686A1C1F949D009A1AD1 /* vorbisStreamSource.cc in Sources */ = {isa = PBXBuildFile; fileRef = 06D168681C1F949D009A1AD1 /* vorbisStreamSource.cc */; }; 06D1686B1C1F949D009A1AD1 /* vorbisStreamSource.h in Sources */ = {isa = PBXBuildFile; fileRef = 06D168691C1F949D009A1AD1 /* vorbisStreamSource.h */; }; 27908DFA18A3F8CB002D41BD /* Animation.c in Sources */ = {isa = PBXBuildFile; fileRef = 27908DCD18A3F8CB002D41BD /* Animation.c */; }; @@ -70,20 +67,20 @@ 2AF1C54016B439BB00C1CF3A /* declaredAssets.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AF1C53C16B439BB00C1CF3A /* declaredAssets.cc */; }; 2AF1C54116B439BB00C1CF3A /* referencedAssets.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AF1C53E16B439BB00C1CF3A /* referencedAssets.cc */; }; 2AF3633916A9BBE0004ED7AA /* ParticleSystem.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AF3633716A9BBE0004ED7AA /* ParticleSystem.cc */; }; + 2B4314C21F1D024900A5C0B7 /* platformNet_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2B4314BD1F1D024900A5C0B7 /* platformNet_ScriptBinding.cc */; }; + 2B4314C31F1D024900A5C0B7 /* platformNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B4314BE1F1D024900A5C0B7 /* platformNet.cpp */; }; + 2B4314C41F1D024900A5C0B7 /* platformNetAsync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B4314C01F1D024900A5C0B7 /* platformNetAsync.cpp */; }; + 2B5F12AC1F1DBC7C006D2B4F /* byteBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5F12AA1F1DBC7C006D2B4F /* byteBuffer.cpp */; }; 86063A251654180000362D83 /* platformOSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = 86063A241654180000362D83 /* platformOSX.mm */; }; 8609FE2F16556DD2004662ED /* osxSemaphore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8609FE2E16556DD2004662ED /* osxSemaphore.mm */; }; 8609FE3116556E5A004662ED /* osxThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8609FE3016556E5A004662ED /* osxThread.mm */; }; 8609FE361655716E004662ED /* osxPopupMenu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8609FE351655716E004662ED /* osxPopupMenu.mm */; }; 8609FE38165572EC004662ED /* osxFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8609FE37165572EC004662ED /* osxFont.mm */; }; 861CD8D01678F6C200DAE1A0 /* fileDialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 861CD8CF1678F6C200DAE1A0 /* fileDialog.cc */; }; - 862BBACD18872BB400E3233A /* libLeap.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 867492F4188727FF00CF0136 /* libLeap.dylib */; }; 8645C96C1887231C004ED987 /* mPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8645C96B1887231C004ED987 /* mPoint.cpp */; }; - 8645C97418872339004ED987 /* leapMotionManager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8645C96F18872339004ED987 /* leapMotionManager.cc */; }; - 8645C97518872339004ED987 /* leapMotionUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8645C97218872339004ED987 /* leapMotionUtil.cpp */; }; 8652C279165586520052D0CB /* osxAudio.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8652C278165586520052D0CB /* osxAudio.mm */; }; 8652F2A016C146CF00639EFE /* torque2d.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8652F29F16C146CF00639EFE /* torque2d.icns */; }; 8658B174165A7BFB0087ABC1 /* osxCPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8658B171165A7BFB0087ABC1 /* osxCPU.mm */; }; - 8658B175165A7BFB0087ABC1 /* osxNetwork.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8658B172165A7BFB0087ABC1 /* osxNetwork.mm */; }; 8658B176165A7BFB0087ABC1 /* osxString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8658B173165A7BFB0087ABC1 /* osxString.mm */; }; 865A20CA16515B1E00527C44 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 869FF8BF1651518C002FE082 /* AppKit.framework */; }; 865A20CC16515B1E00527C44 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 869FF8BC1651518C002FE082 /* Cocoa.framework */; }; @@ -208,7 +205,6 @@ 866381DC165556AD00C8C551 /* osxMath.mm in Sources */ = {isa = PBXBuildFile; fileRef = 866381DB165556AD00C8C551 /* osxMath.mm */; }; 866381E51655615200C8C551 /* osxInput.mm in Sources */ = {isa = PBXBuildFile; fileRef = 866381E41655615200C8C551 /* osxInput.mm */; }; 866381E91655674B00C8C551 /* osxTime.mm in Sources */ = {isa = PBXBuildFile; fileRef = 866381E81655674B00C8C551 /* osxTime.mm */; }; - 867492F5188727FF00CF0136 /* libLeap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 867492F4188727FF00CF0136 /* libLeap.dylib */; }; 86854E341663AAE6009FAFB2 /* osxOpenGLDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 86854E331663AAE6009FAFB2 /* osxOpenGLDevice.mm */; }; 8694ADC81656B06B0080ABAC /* osxEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8694ADC51656B06B0080ABAC /* osxEvents.mm */; }; 8694ADC91656B06B0080ABAC /* osxWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8694ADC61656B06B0080ABAC /* osxWindow.mm */; }; @@ -449,7 +445,6 @@ 86D770911656873C0046D71F /* platformFileIO.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC835016518FE800D96ADF /* platformFileIO.cc */; }; 86D770921656873C0046D71F /* platformFont.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC834416518FE800D96ADF /* platformFont.cc */; }; 86D770931656873C0046D71F /* platformMemory.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC835116518FE800D96ADF /* platformMemory.cc */; }; - 86D770941656873C0046D71F /* platformNetAsync.unix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC835216518FE800D96ADF /* platformNetAsync.unix.cc */; }; 86D770951656873C0046D71F /* platformString.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC835316518FE800D96ADF /* platformString.cc */; }; 86D770961656873C0046D71F /* platformVideo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC835416518FE800D96ADF /* platformVideo.cc */; }; 86D770971656873C0046D71F /* Tickable.cc in Sources */ = {isa = PBXBuildFile; fileRef = 86BC834A16518FE800D96ADF /* Tickable.cc */; }; @@ -480,7 +475,6 @@ 86EC5AC7165C1E0100757872 /* osxTorqueView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 86EC5AC6165C1E0100757872 /* osxTorqueView.mm */; }; B350D12F174ED1FE00033EBB /* math_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D12C174ED1FE00033EBB /* math_ScriptBinding.cc */; }; B350D131174ED23E00033EBB /* frameAllocator_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D130174ED23E00033EBB /* frameAllocator_ScriptBinding.cc */; }; - B350D147174ED56500033EBB /* platformNetwork_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D144174ED56500033EBB /* platformNetwork_ScriptBinding.cc */; }; B350D158174EF62400033EBB /* fileSystem_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D156174EF62400033EBB /* fileSystem_ScriptBinding.cc */; }; B350D164174EF71B00033EBB /* metaScripting_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D161174EF71B00033EBB /* metaScripting_ScriptBinding.cc */; }; B350D172174EF91900033EBB /* audio_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D171174EF91900033EBB /* audio_ScriptBinding.cc */; }; @@ -489,25 +483,38 @@ D000F97C1CB0D16A00C4D097 /* BitmapFontCharacter.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9771CB0D16A00C4D097 /* BitmapFontCharacter.cc */; }; D000F9801CB0D1B300C4D097 /* FontAsset.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F97E1CB0D1B300C4D097 /* FontAsset.cc */; }; D000F9841CB0D25A00C4D097 /* TextSprite.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9821CB0D25A00C4D097 /* TextSprite.cc */; }; + D0D55C571EAAA5A500B2C750 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = D0D55C4B1EAAA5A500B2C750 /* AUTHORS */; }; + D0D55C581EAAA5A500B2C750 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = D0D55C4C1EAAA5A500B2C750 /* CHANGES */; }; + D0D55C591EAAA5A500B2C750 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = D0D55C4D1EAAA5A500B2C750 /* COPYING */; }; + D0D55C5A1EAAA5A500B2C750 /* README in Resources */ = {isa = PBXBuildFile; fileRef = D0D55C531EAAA5A500B2C750 /* README */; }; + D0D55C5B1EAAA5A500B2C750 /* bitwise.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C551EAAA5A500B2C750 /* bitwise.c */; }; + D0D55C5C1EAAA5A500B2C750 /* framing.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C561EAAA5A500B2C750 /* framing.c */; }; + D0D55CAC1EAAA5BB00B2C750 /* analysis.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C5E1EAAA5BB00B2C750 /* analysis.c */; }; + D0D55CAE1EAAA5BB00B2C750 /* bitrate.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C611EAAA5BB00B2C750 /* bitrate.c */; }; + D0D55CAF1EAAA5BB00B2C750 /* block.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C631EAAA5BB00B2C750 /* block.c */; }; + D0D55CB01EAAA5BB00B2C750 /* codebook.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C641EAAA5BB00B2C750 /* codebook.c */; }; + D0D55CB11EAAA5BB00B2C750 /* envelope.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C671EAAA5BB00B2C750 /* envelope.c */; }; + D0D55CB21EAAA5BB00B2C750 /* floor0.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C691EAAA5BB00B2C750 /* floor0.c */; }; + D0D55CB31EAAA5BB00B2C750 /* floor1.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C6A1EAAA5BB00B2C750 /* floor1.c */; }; + D0D55CB41EAAA5BB00B2C750 /* info.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C711EAAA5BB00B2C750 /* info.c */; }; + D0D55CB51EAAA5BB00B2C750 /* lookup.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C8F1EAAA5BB00B2C750 /* lookup.c */; }; + D0D55CB61EAAA5BB00B2C750 /* lookups.pl in Resources */ = {isa = PBXBuildFile; fileRef = D0D55C921EAAA5BB00B2C750 /* lookups.pl */; }; + D0D55CB71EAAA5BB00B2C750 /* lpc.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C931EAAA5BB00B2C750 /* lpc.c */; }; + D0D55CB81EAAA5BB00B2C750 /* lsp.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C951EAAA5BB00B2C750 /* lsp.c */; }; + D0D55CB91EAAA5BB00B2C750 /* mapping0.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C971EAAA5BB00B2C750 /* mapping0.c */; }; + D0D55CBA1EAAA5BB00B2C750 /* mdct.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C991EAAA5BB00B2C750 /* mdct.c */; }; + D0D55CBB1EAAA5BB00B2C750 /* psy.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C9D1EAAA5BB00B2C750 /* psy.c */; }; + D0D55CBC1EAAA5BB00B2C750 /* registry.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55C9F1EAAA5BB00B2C750 /* registry.c */; }; + D0D55CBD1EAAA5BB00B2C750 /* res0.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA11EAAA5BB00B2C750 /* res0.c */; }; + D0D55CBE1EAAA5BB00B2C750 /* sharedbook.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA31EAAA5BB00B2C750 /* sharedbook.c */; }; + D0D55CBF1EAAA5BB00B2C750 /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA41EAAA5BB00B2C750 /* smallft.c */; }; + D0D55CC01EAAA5BB00B2C750 /* synthesis.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA61EAAA5BB00B2C750 /* synthesis.c */; }; + D0D55CC21EAAA5BB00B2C750 /* vorbisenc.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA81EAAA5BB00B2C750 /* vorbisenc.c */; }; + D0D55CC31EAAA5BB00B2C750 /* vorbisfile.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CA91EAAA5BB00B2C750 /* vorbisfile.c */; }; + D0D55CC41EAAA5BB00B2C750 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = D0D55CAA1EAAA5BB00B2C750 /* window.c */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 8645C978188723B7004ED987 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 6; - files = ( - 862BBACD18872BB400E3233A /* libLeap.dylib in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 06D1685F1C1F90AB009A1AD1 /* libogg.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libogg.0.dylib; path = /usr/local/lib/libogg.0.dylib; sourceTree = ""; }; - 06D168601C1F90AB009A1AD1 /* libvorbis.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbis.0.dylib; path = /usr/local/lib/libvorbis.0.dylib; sourceTree = ""; }; - 06D168611C1F90AB009A1AD1 /* libvorbisfile.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.3.dylib; path = /usr/local/lib/libvorbisfile.3.dylib; sourceTree = ""; }; 06D168681C1F949D009A1AD1 /* vorbisStreamSource.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = vorbisStreamSource.cc; sourceTree = ""; }; 06D168691C1F949D009A1AD1 /* vorbisStreamSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vorbisStreamSource.h; sourceTree = ""; }; 27908DCD18A3F8CB002D41BD /* Animation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Animation.c; path = ../../../source/spine/Animation.c; sourceTree = ""; }; @@ -658,6 +665,16 @@ 2AF3633716A9BBE0004ED7AA /* ParticleSystem.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleSystem.cc; sourceTree = ""; }; 2AF3633816A9BBE0004ED7AA /* ParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleSystem.h; sourceTree = ""; }; 2AF80CFF16A80CB400CE13F1 /* ParticleAssetEmitter_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleAssetEmitter_ScriptBinding.h; sourceTree = ""; }; + 2B4314BD1F1D024900A5C0B7 /* platformNet_ScriptBinding.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNet_ScriptBinding.cc; sourceTree = ""; }; + 2B4314BE1F1D024900A5C0B7 /* platformNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNet.cpp; sourceTree = ""; }; + 2B4314BF1F1D024900A5C0B7 /* platformNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNet.h; sourceTree = ""; }; + 2B4314C01F1D024900A5C0B7 /* platformNetAsync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetAsync.cpp; sourceTree = ""; }; + 2B4314C11F1D024900A5C0B7 /* platformNetAsync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetAsync.h; sourceTree = ""; }; + 2B4314C51F1D026300A5C0B7 /* tmm_off.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmm_off.h; sourceTree = ""; }; + 2B4314C61F1D026300A5C0B7 /* tmm_on.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmm_on.h; sourceTree = ""; }; + 2B4314C71F1D026A00A5C0B7 /* typetraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typetraits.h; sourceTree = ""; }; + 2B5F12AA1F1DBC7C006D2B4F /* byteBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = byteBuffer.cpp; sourceTree = ""; }; + 2B5F12AB1F1DBC7C006D2B4F /* byteBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = byteBuffer.h; sourceTree = ""; }; 86063A231654180000362D83 /* platformOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformOSX.h; sourceTree = ""; }; 86063A241654180000362D83 /* platformOSX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platformOSX.mm; sourceTree = ""; }; 8609FE2E16556DD2004662ED /* osxSemaphore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osxSemaphore.mm; sourceTree = ""; }; @@ -668,12 +685,6 @@ 861CD8CE1678F6C200DAE1A0 /* fileDialog_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileDialog_ScriptBinding.h; sourceTree = ""; }; 861CD8CF1678F6C200DAE1A0 /* fileDialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileDialog.cc; sourceTree = ""; }; 8645C96B1887231C004ED987 /* mPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mPoint.cpp; sourceTree = ""; }; - 8645C96E18872339004ED987 /* leapMotionConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = leapMotionConstants.h; sourceTree = ""; }; - 8645C96F18872339004ED987 /* leapMotionManager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = leapMotionManager.cc; sourceTree = ""; }; - 8645C97018872339004ED987 /* leapMotionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = leapMotionManager.h; sourceTree = ""; }; - 8645C97118872339004ED987 /* LeapMotionManager_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LeapMotionManager_ScriptBinding.h; sourceTree = ""; }; - 8645C97218872339004ED987 /* leapMotionUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = leapMotionUtil.cpp; sourceTree = ""; }; - 8645C97318872339004ED987 /* leapMotionUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = leapMotionUtil.h; sourceTree = ""; }; 864ECFEA1652795700012416 /* platform_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_ScriptBinding.h; sourceTree = ""; }; 864ECFED165279E100012416 /* networkProcessList.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = networkProcessList.cc; sourceTree = ""; }; 864ECFEE165279E100012416 /* networkProcessList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = networkProcessList.h; sourceTree = ""; }; @@ -681,7 +692,6 @@ 8652C278165586520052D0CB /* osxAudio.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osxAudio.mm; sourceTree = ""; }; 8652F29F16C146CF00639EFE /* torque2d.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = torque2d.icns; sourceTree = ""; }; 8658B171165A7BFB0087ABC1 /* osxCPU.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osxCPU.mm; sourceTree = ""; }; - 8658B172165A7BFB0087ABC1 /* osxNetwork.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osxNetwork.mm; sourceTree = ""; }; 8658B173165A7BFB0087ABC1 /* osxString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = osxString.mm; sourceTree = ""; }; 865A20B01651530B00527C44 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = Torque2D/Config.xcconfig; sourceTree = ""; }; 865A20BE165158CA00527C44 /* torque2d.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = torque2d.icns; path = Torque2D/torque2d.icns; sourceTree = ""; }; @@ -1426,7 +1436,6 @@ 86BC834316518FE800D96ADF /* platformMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformMath.h; sourceTree = ""; }; 86BC834416518FE800D96ADF /* platformFont.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformFont.cc; sourceTree = ""; }; 86BC834516518FE800D96ADF /* platformMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformMemory.h; sourceTree = ""; }; - 86BC834616518FE800D96ADF /* platformNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetwork.h; sourceTree = ""; }; 86BC834716518FE800D96ADF /* platformString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformString.h; sourceTree = ""; }; 86BC834816518FE800D96ADF /* platformCPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformCPU.h; sourceTree = ""; }; 86BC834916518FE800D96ADF /* platformEndian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformEndian.h; sourceTree = ""; }; @@ -1438,7 +1447,6 @@ 86BC834F16518FE800D96ADF /* platformCPU.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformCPU.cc; sourceTree = ""; }; 86BC835016518FE800D96ADF /* platformFileIO.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformFileIO.cc; sourceTree = ""; }; 86BC835116518FE800D96ADF /* platformMemory.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformMemory.cc; sourceTree = ""; }; - 86BC835216518FE800D96ADF /* platformNetAsync.unix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetAsync.unix.cc; sourceTree = ""; }; 86BC835316518FE800D96ADF /* platformString.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformString.cc; sourceTree = ""; }; 86BC835416518FE800D96ADF /* platformVideo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformVideo.cc; sourceTree = ""; }; 86BC835516518FE800D96ADF /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; @@ -1449,7 +1457,6 @@ 86BC835A16518FE800D96ADF /* platformFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformFont.h; sourceTree = ""; }; 86BC835B16518FE800D96ADF /* platformGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformGL.h; sourceTree = ""; }; 86BC835C16518FE800D96ADF /* platformInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformInput.h; sourceTree = ""; }; - 86BC835D16518FE800D96ADF /* platformNetAsync.unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetAsync.unix.h; sourceTree = ""; }; 86BC835E16518FE800D96ADF /* platformSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformSemaphore.h; sourceTree = ""; }; 86BC835F16518FE800D96ADF /* platformTLS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformTLS.h; sourceTree = ""; }; 86BC836016518FE800D96ADF /* platformVFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformVFS.h; sourceTree = ""; }; @@ -1495,7 +1502,6 @@ B350D141174ED56500033EBB /* CursorManager_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CursorManager_ScriptBinding.h; sourceTree = ""; }; B350D142174ED56500033EBB /* platformAssert_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformAssert_ScriptBinding.h; sourceTree = ""; }; B350D143174ED56500033EBB /* platformFileIO_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformFileIO_ScriptBinding.h; sourceTree = ""; }; - B350D144174ED56500033EBB /* platformNetwork_ScriptBinding.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetwork_ScriptBinding.cc; sourceTree = ""; }; B350D145174ED56500033EBB /* platformString_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformString_ScriptBinding.h; sourceTree = ""; }; B350D146174ED56500033EBB /* platformVideo_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformVideo_ScriptBinding.h; sourceTree = ""; }; B350D148174EE4AA00033EBB /* msgBox_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msgBox_ScriptBinding.h; sourceTree = ""; }; @@ -1554,6 +1560,86 @@ D000F9811CB0D25A00C4D097 /* TextSprite_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSprite_ScriptBinding.h; sourceTree = ""; }; D000F9821CB0D25A00C4D097 /* TextSprite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSprite.cc; sourceTree = ""; }; D000F9831CB0D25A00C4D097 /* TextSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSprite.h; sourceTree = ""; }; + D0D55C4B1EAAA5A500B2C750 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = ""; }; + D0D55C4C1EAAA5A500B2C750 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; + D0D55C4D1EAAA5A500B2C750 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; + D0D55C501EAAA5A500B2C750 /* config_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config_types.h; sourceTree = ""; }; + D0D55C511EAAA5A500B2C750 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = ""; }; + D0D55C521EAAA5A500B2C750 /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = ""; }; + D0D55C531EAAA5A500B2C750 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; + D0D55C551EAAA5A500B2C750 /* bitwise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitwise.c; sourceTree = ""; }; + D0D55C561EAAA5A500B2C750 /* framing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = framing.c; sourceTree = ""; }; + D0D55C5E1EAAA5BB00B2C750 /* analysis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = analysis.c; sourceTree = ""; }; + D0D55C5F1EAAA5BB00B2C750 /* backends.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = backends.h; sourceTree = ""; }; + D0D55C601EAAA5BB00B2C750 /* barkmel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = barkmel.c; sourceTree = ""; }; + D0D55C611EAAA5BB00B2C750 /* bitrate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitrate.c; sourceTree = ""; }; + D0D55C621EAAA5BB00B2C750 /* bitrate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitrate.h; sourceTree = ""; }; + D0D55C631EAAA5BB00B2C750 /* block.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = block.c; sourceTree = ""; }; + D0D55C641EAAA5BB00B2C750 /* codebook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codebook.c; sourceTree = ""; }; + D0D55C651EAAA5BB00B2C750 /* codebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codebook.h; sourceTree = ""; }; + D0D55C661EAAA5BB00B2C750 /* codec_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec_internal.h; sourceTree = ""; }; + D0D55C671EAAA5BB00B2C750 /* envelope.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = envelope.c; sourceTree = ""; }; + D0D55C681EAAA5BB00B2C750 /* envelope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = envelope.h; sourceTree = ""; }; + D0D55C691EAAA5BB00B2C750 /* floor0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = floor0.c; sourceTree = ""; }; + D0D55C6A1EAAA5BB00B2C750 /* floor1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = floor1.c; sourceTree = ""; }; + D0D55C6B1EAAA5BB00B2C750 /* highlevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = highlevel.h; sourceTree = ""; }; + D0D55C6E1EAAA5BB00B2C750 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = ""; }; + D0D55C6F1EAAA5BB00B2C750 /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = ""; }; + D0D55C701EAAA5BB00B2C750 /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = ""; }; + D0D55C711EAAA5BB00B2C750 /* info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = info.c; sourceTree = ""; }; + D0D55C751EAAA5BB00B2C750 /* res_books_51.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = res_books_51.h; sourceTree = ""; }; + D0D55C761EAAA5BB00B2C750 /* res_books_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = res_books_stereo.h; sourceTree = ""; }; + D0D55C781EAAA5BB00B2C750 /* floor_books.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = floor_books.h; sourceTree = ""; }; + D0D55C7A1EAAA5BB00B2C750 /* res_books_uncoupled.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = res_books_uncoupled.h; sourceTree = ""; }; + D0D55C7C1EAAA5BB00B2C750 /* floor_all.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = floor_all.h; sourceTree = ""; }; + D0D55C7D1EAAA5BB00B2C750 /* psych_11.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psych_11.h; sourceTree = ""; }; + D0D55C7E1EAAA5BB00B2C750 /* psych_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psych_16.h; sourceTree = ""; }; + D0D55C7F1EAAA5BB00B2C750 /* psych_44.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psych_44.h; sourceTree = ""; }; + D0D55C801EAAA5BB00B2C750 /* psych_8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psych_8.h; sourceTree = ""; }; + D0D55C811EAAA5BB00B2C750 /* residue_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = residue_16.h; sourceTree = ""; }; + D0D55C821EAAA5BB00B2C750 /* residue_44.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = residue_44.h; sourceTree = ""; }; + D0D55C831EAAA5BB00B2C750 /* residue_44p51.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = residue_44p51.h; sourceTree = ""; }; + D0D55C841EAAA5BB00B2C750 /* residue_44u.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = residue_44u.h; sourceTree = ""; }; + D0D55C851EAAA5BB00B2C750 /* residue_8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = residue_8.h; sourceTree = ""; }; + D0D55C861EAAA5BB00B2C750 /* setup_11.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_11.h; sourceTree = ""; }; + D0D55C871EAAA5BB00B2C750 /* setup_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_16.h; sourceTree = ""; }; + D0D55C881EAAA5BB00B2C750 /* setup_22.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_22.h; sourceTree = ""; }; + D0D55C891EAAA5BB00B2C750 /* setup_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_32.h; sourceTree = ""; }; + D0D55C8A1EAAA5BB00B2C750 /* setup_44.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_44.h; sourceTree = ""; }; + D0D55C8B1EAAA5BB00B2C750 /* setup_44p51.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_44p51.h; sourceTree = ""; }; + D0D55C8C1EAAA5BB00B2C750 /* setup_44u.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_44u.h; sourceTree = ""; }; + D0D55C8D1EAAA5BB00B2C750 /* setup_8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_8.h; sourceTree = ""; }; + D0D55C8E1EAAA5BB00B2C750 /* setup_X.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_X.h; sourceTree = ""; }; + D0D55C8F1EAAA5BB00B2C750 /* lookup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lookup.c; sourceTree = ""; }; + D0D55C901EAAA5BB00B2C750 /* lookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lookup.h; sourceTree = ""; }; + D0D55C911EAAA5BB00B2C750 /* lookup_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lookup_data.h; sourceTree = ""; }; + D0D55C921EAAA5BB00B2C750 /* lookups.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = lookups.pl; sourceTree = ""; }; + D0D55C931EAAA5BB00B2C750 /* lpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc.c; sourceTree = ""; }; + D0D55C941EAAA5BB00B2C750 /* lpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lpc.h; sourceTree = ""; }; + D0D55C951EAAA5BB00B2C750 /* lsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsp.c; sourceTree = ""; }; + D0D55C961EAAA5BB00B2C750 /* lsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lsp.h; sourceTree = ""; }; + D0D55C971EAAA5BB00B2C750 /* mapping0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mapping0.c; sourceTree = ""; }; + D0D55C981EAAA5BB00B2C750 /* masking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = masking.h; sourceTree = ""; }; + D0D55C991EAAA5BB00B2C750 /* mdct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdct.c; sourceTree = ""; }; + D0D55C9A1EAAA5BB00B2C750 /* mdct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdct.h; sourceTree = ""; }; + D0D55C9B1EAAA5BB00B2C750 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; + D0D55C9C1EAAA5BB00B2C750 /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os.h; sourceTree = ""; }; + D0D55C9D1EAAA5BB00B2C750 /* psy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psy.c; sourceTree = ""; }; + D0D55C9E1EAAA5BB00B2C750 /* psy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psy.h; sourceTree = ""; }; + D0D55C9F1EAAA5BB00B2C750 /* registry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = registry.c; sourceTree = ""; }; + D0D55CA01EAAA5BB00B2C750 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; + D0D55CA11EAAA5BB00B2C750 /* res0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = res0.c; sourceTree = ""; }; + D0D55CA21EAAA5BB00B2C750 /* scales.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scales.h; sourceTree = ""; }; + D0D55CA31EAAA5BB00B2C750 /* sharedbook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sharedbook.c; sourceTree = ""; }; + D0D55CA41EAAA5BB00B2C750 /* smallft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smallft.c; sourceTree = ""; }; + D0D55CA51EAAA5BB00B2C750 /* smallft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smallft.h; sourceTree = ""; }; + D0D55CA61EAAA5BB00B2C750 /* synthesis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = synthesis.c; sourceTree = ""; }; + D0D55CA71EAAA5BB00B2C750 /* tone.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tone.c; sourceTree = ""; }; + D0D55CA81EAAA5BB00B2C750 /* vorbisenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vorbisenc.c; sourceTree = ""; }; + D0D55CA91EAAA5BB00B2C750 /* vorbisfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vorbisfile.c; sourceTree = ""; }; + D0D55CAA1EAAA5BB00B2C750 /* window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = window.c; sourceTree = ""; }; + D0D55CAB1EAAA5BB00B2C750 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = ""; }; + D0D55CC51EAAD65800B2C750 /* mNormalDistribution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mNormalDistribution.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1561,10 +1647,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 06D168651C1F90F1009A1AD1 /* libogg.0.dylib in Frameworks */, - 06D168661C1F90F1009A1AD1 /* libvorbis.0.dylib in Frameworks */, - 06D168671C1F90F1009A1AD1 /* libvorbisfile.3.dylib in Frameworks */, - 867492F5188727FF00CF0136 /* libLeap.dylib in Frameworks */, 865A20CA16515B1E00527C44 /* AppKit.framework in Frameworks */, 865A20CC16515B1E00527C44 /* Cocoa.framework in Frameworks */, 865A20CD16515B1E00527C44 /* CoreData.framework in Frameworks */, @@ -1766,19 +1848,6 @@ name = composites; sourceTree = ""; }; - 8645C96D18872339004ED987 /* leapMotion */ = { - isa = PBXGroup; - children = ( - 8645C96E18872339004ED987 /* leapMotionConstants.h */, - 8645C96F18872339004ED987 /* leapMotionManager.cc */, - 8645C97018872339004ED987 /* leapMotionManager.h */, - 8645C97118872339004ED987 /* LeapMotionManager_ScriptBinding.h */, - 8645C97218872339004ED987 /* leapMotionUtil.cpp */, - 8645C97318872339004ED987 /* leapMotionUtil.h */, - ); - path = leapMotion; - sourceTree = ""; - }; 865A20BD1651589F00527C44 /* Resources */ = { isa = PBXGroup; children = ( @@ -1805,6 +1874,8 @@ 865A21E71651875E00527C44 /* Support_Libraries */ = { isa = PBXGroup; children = ( + D0D55C5D1EAAA5BB00B2C750 /* libvorbis */, + D0D55C4A1EAAA5A500B2C750 /* libogg */, 865A22D6165187D700527C44 /* lpng */, 865A22D5165187D100527C44 /* ljpeg */, 865A21E8165187B600527C44 /* Box2D */, @@ -2068,7 +2139,6 @@ 8660471D16557B3000A67DE6 /* osxMath_ScriptBinding.h */, 866381D91655562400C8C551 /* osxMemory.mm */, 2ABF5C8E16569A0C00BBBF1D /* osxMutex.mm */, - 8658B172165A7BFB0087ABC1 /* osxNetwork.mm */, 86854E321663AAE6009FAFB2 /* osxOpenGLDevice.h */, 86854E331663AAE6009FAFB2 /* osxOpenGLDevice.mm */, 86D76F76165683240046D71F /* osxOutlineGL.cc */, @@ -2116,9 +2186,6 @@ 869FF8BB1651518C002FE082 /* Frameworks */ = { isa = PBXGroup; children = ( - 06D1685F1C1F90AB009A1AD1 /* libogg.0.dylib */, - 06D168601C1F90AB009A1AD1 /* libvorbis.0.dylib */, - 06D168611C1F90AB009A1AD1 /* libvorbisfile.3.dylib */, 867492F4188727FF00CF0136 /* libLeap.dylib */, 865A20C916515AEF00527C44 /* System */, 869FF8BE1651518C002FE082 /* Other Frameworks */, @@ -2810,7 +2877,6 @@ 86BC805816518D4600D96ADF /* input */ = { isa = PBXGroup; children = ( - 8645C96D18872339004ED987 /* leapMotion */, B350D153174EF5F200033EBB /* actionMap_ScriptBinding.h */, 86BC805916518D4600D96ADF /* actionMap.cc */, 86BC805A16518D4600D96ADF /* actionMap.h */, @@ -2822,6 +2888,8 @@ 86BC805B16518D4600D96ADF /* io */ = { isa = PBXGroup; children = ( + 2B5F12AA1F1DBC7C006D2B4F /* byteBuffer.cpp */, + 2B5F12AB1F1DBC7C006D2B4F /* byteBuffer.h */, B350D154174EF62400033EBB /* fileObject_ScriptBinding.h */, B350D155174EF62400033EBB /* fileStreamObject_ScriptBinding.h */, B350D156174EF62400033EBB /* fileSystem_ScriptBinding.cc */, @@ -2896,6 +2964,7 @@ 86BC809116518D4600D96ADF /* math */ = { isa = PBXGroup; children = ( + D0D55CC51EAAD65800B2C750 /* mNormalDistribution.h */, 8645C96B1887231C004ED987 /* mPoint.cpp */, B350D12B174ED1FE00033EBB /* box_ScriptBinding.h */, B350D12C174ED1FE00033EBB /* math_ScriptBinding.cc */, @@ -3152,11 +3221,18 @@ 86BC82ED16518F6800D96ADF /* platform */ = { isa = PBXGroup; children = ( + 2B4314C71F1D026A00A5C0B7 /* typetraits.h */, + 2B4314C51F1D026300A5C0B7 /* tmm_off.h */, + 2B4314C61F1D026300A5C0B7 /* tmm_on.h */, + 2B4314BD1F1D024900A5C0B7 /* platformNet_ScriptBinding.cc */, + 2B4314BE1F1D024900A5C0B7 /* platformNet.cpp */, + 2B4314BF1F1D024900A5C0B7 /* platformNet.h */, + 2B4314C01F1D024900A5C0B7 /* platformNetAsync.cpp */, + 2B4314C11F1D024900A5C0B7 /* platformNetAsync.h */, 2797C9E117F4E12500625B51 /* eaxtypes.h */, B350D141174ED56500033EBB /* CursorManager_ScriptBinding.h */, B350D142174ED56500033EBB /* platformAssert_ScriptBinding.h */, B350D143174ED56500033EBB /* platformFileIO_ScriptBinding.h */, - B350D144174ED56500033EBB /* platformNetwork_ScriptBinding.cc */, B350D145174ED56500033EBB /* platformString_ScriptBinding.h */, B350D146174ED56500033EBB /* platformVideo_ScriptBinding.h */, 86BC834C16518FE800D96ADF /* CursorManager.cc */, @@ -3183,9 +3259,6 @@ 86BC834316518FE800D96ADF /* platformMath.h */, 86BC835116518FE800D96ADF /* platformMemory.cc */, 86BC834516518FE800D96ADF /* platformMemory.h */, - 86BC835216518FE800D96ADF /* platformNetAsync.unix.cc */, - 86BC835D16518FE800D96ADF /* platformNetAsync.unix.h */, - 86BC834616518FE800D96ADF /* platformNetwork.h */, 86BC835E16518FE800D96ADF /* platformSemaphore.h */, 86BC835316518FE800D96ADF /* platformString.cc */, 86BC834716518FE800D96ADF /* platformString.h */, @@ -3252,6 +3325,189 @@ path = ../../../source/bitmapFont; sourceTree = ""; }; + D0D55C4A1EAAA5A500B2C750 /* libogg */ = { + isa = PBXGroup; + children = ( + D0D55C4B1EAAA5A500B2C750 /* AUTHORS */, + D0D55C4C1EAAA5A500B2C750 /* CHANGES */, + D0D55C4D1EAAA5A500B2C750 /* COPYING */, + D0D55C4E1EAAA5A500B2C750 /* include */, + D0D55C531EAAA5A500B2C750 /* README */, + D0D55C541EAAA5A500B2C750 /* src */, + ); + name = libogg; + path = ../../lib/libogg; + sourceTree = ""; + }; + D0D55C4E1EAAA5A500B2C750 /* include */ = { + isa = PBXGroup; + children = ( + D0D55C4F1EAAA5A500B2C750 /* ogg */, + ); + path = include; + sourceTree = ""; + }; + D0D55C4F1EAAA5A500B2C750 /* ogg */ = { + isa = PBXGroup; + children = ( + D0D55C501EAAA5A500B2C750 /* config_types.h */, + D0D55C511EAAA5A500B2C750 /* ogg.h */, + D0D55C521EAAA5A500B2C750 /* os_types.h */, + ); + path = ogg; + sourceTree = ""; + }; + D0D55C541EAAA5A500B2C750 /* src */ = { + isa = PBXGroup; + children = ( + D0D55C551EAAA5A500B2C750 /* bitwise.c */, + D0D55C561EAAA5A500B2C750 /* framing.c */, + ); + path = src; + sourceTree = ""; + }; + D0D55C5D1EAAA5BB00B2C750 /* libvorbis */ = { + isa = PBXGroup; + children = ( + D0D55C5E1EAAA5BB00B2C750 /* analysis.c */, + D0D55C5F1EAAA5BB00B2C750 /* backends.h */, + D0D55C601EAAA5BB00B2C750 /* barkmel.c */, + D0D55C611EAAA5BB00B2C750 /* bitrate.c */, + D0D55C621EAAA5BB00B2C750 /* bitrate.h */, + D0D55C631EAAA5BB00B2C750 /* block.c */, + D0D55C641EAAA5BB00B2C750 /* codebook.c */, + D0D55C651EAAA5BB00B2C750 /* codebook.h */, + D0D55C661EAAA5BB00B2C750 /* codec_internal.h */, + D0D55C671EAAA5BB00B2C750 /* envelope.c */, + D0D55C681EAAA5BB00B2C750 /* envelope.h */, + D0D55C691EAAA5BB00B2C750 /* floor0.c */, + D0D55C6A1EAAA5BB00B2C750 /* floor1.c */, + D0D55C6B1EAAA5BB00B2C750 /* highlevel.h */, + D0D55C6C1EAAA5BB00B2C750 /* include */, + D0D55C711EAAA5BB00B2C750 /* info.c */, + D0D55C721EAAA5BB00B2C750 /* lib */, + D0D55C8F1EAAA5BB00B2C750 /* lookup.c */, + D0D55C901EAAA5BB00B2C750 /* lookup.h */, + D0D55C911EAAA5BB00B2C750 /* lookup_data.h */, + D0D55C921EAAA5BB00B2C750 /* lookups.pl */, + D0D55C931EAAA5BB00B2C750 /* lpc.c */, + D0D55C941EAAA5BB00B2C750 /* lpc.h */, + D0D55C951EAAA5BB00B2C750 /* lsp.c */, + D0D55C961EAAA5BB00B2C750 /* lsp.h */, + D0D55C971EAAA5BB00B2C750 /* mapping0.c */, + D0D55C981EAAA5BB00B2C750 /* masking.h */, + D0D55C991EAAA5BB00B2C750 /* mdct.c */, + D0D55C9A1EAAA5BB00B2C750 /* mdct.h */, + D0D55C9B1EAAA5BB00B2C750 /* misc.h */, + D0D55C9C1EAAA5BB00B2C750 /* os.h */, + D0D55C9D1EAAA5BB00B2C750 /* psy.c */, + D0D55C9E1EAAA5BB00B2C750 /* psy.h */, + D0D55C9F1EAAA5BB00B2C750 /* registry.c */, + D0D55CA01EAAA5BB00B2C750 /* registry.h */, + D0D55CA11EAAA5BB00B2C750 /* res0.c */, + D0D55CA21EAAA5BB00B2C750 /* scales.h */, + D0D55CA31EAAA5BB00B2C750 /* sharedbook.c */, + D0D55CA41EAAA5BB00B2C750 /* smallft.c */, + D0D55CA51EAAA5BB00B2C750 /* smallft.h */, + D0D55CA61EAAA5BB00B2C750 /* synthesis.c */, + D0D55CA71EAAA5BB00B2C750 /* tone.c */, + D0D55CA81EAAA5BB00B2C750 /* vorbisenc.c */, + D0D55CA91EAAA5BB00B2C750 /* vorbisfile.c */, + D0D55CAA1EAAA5BB00B2C750 /* window.c */, + D0D55CAB1EAAA5BB00B2C750 /* window.h */, + ); + name = libvorbis; + path = ../../lib/libvorbis; + sourceTree = ""; + }; + D0D55C6C1EAAA5BB00B2C750 /* include */ = { + isa = PBXGroup; + children = ( + D0D55C6D1EAAA5BB00B2C750 /* vorbis */, + ); + path = include; + sourceTree = ""; + }; + D0D55C6D1EAAA5BB00B2C750 /* vorbis */ = { + isa = PBXGroup; + children = ( + D0D55C6E1EAAA5BB00B2C750 /* codec.h */, + D0D55C6F1EAAA5BB00B2C750 /* vorbisenc.h */, + D0D55C701EAAA5BB00B2C750 /* vorbisfile.h */, + ); + path = vorbis; + sourceTree = ""; + }; + D0D55C721EAAA5BB00B2C750 /* lib */ = { + isa = PBXGroup; + children = ( + D0D55C731EAAA5BB00B2C750 /* books */, + D0D55C7B1EAAA5BB00B2C750 /* modes */, + ); + path = lib; + sourceTree = ""; + }; + D0D55C731EAAA5BB00B2C750 /* books */ = { + isa = PBXGroup; + children = ( + D0D55C741EAAA5BB00B2C750 /* coupled */, + D0D55C771EAAA5BB00B2C750 /* floor */, + D0D55C791EAAA5BB00B2C750 /* uncoupled */, + ); + path = books; + sourceTree = ""; + }; + D0D55C741EAAA5BB00B2C750 /* coupled */ = { + isa = PBXGroup; + children = ( + D0D55C751EAAA5BB00B2C750 /* res_books_51.h */, + D0D55C761EAAA5BB00B2C750 /* res_books_stereo.h */, + ); + path = coupled; + sourceTree = ""; + }; + D0D55C771EAAA5BB00B2C750 /* floor */ = { + isa = PBXGroup; + children = ( + D0D55C781EAAA5BB00B2C750 /* floor_books.h */, + ); + path = floor; + sourceTree = ""; + }; + D0D55C791EAAA5BB00B2C750 /* uncoupled */ = { + isa = PBXGroup; + children = ( + D0D55C7A1EAAA5BB00B2C750 /* res_books_uncoupled.h */, + ); + path = uncoupled; + sourceTree = ""; + }; + D0D55C7B1EAAA5BB00B2C750 /* modes */ = { + isa = PBXGroup; + children = ( + D0D55C7C1EAAA5BB00B2C750 /* floor_all.h */, + D0D55C7D1EAAA5BB00B2C750 /* psych_11.h */, + D0D55C7E1EAAA5BB00B2C750 /* psych_16.h */, + D0D55C7F1EAAA5BB00B2C750 /* psych_44.h */, + D0D55C801EAAA5BB00B2C750 /* psych_8.h */, + D0D55C811EAAA5BB00B2C750 /* residue_16.h */, + D0D55C821EAAA5BB00B2C750 /* residue_44.h */, + D0D55C831EAAA5BB00B2C750 /* residue_44p51.h */, + D0D55C841EAAA5BB00B2C750 /* residue_44u.h */, + D0D55C851EAAA5BB00B2C750 /* residue_8.h */, + D0D55C861EAAA5BB00B2C750 /* setup_11.h */, + D0D55C871EAAA5BB00B2C750 /* setup_16.h */, + D0D55C881EAAA5BB00B2C750 /* setup_22.h */, + D0D55C891EAAA5BB00B2C750 /* setup_32.h */, + D0D55C8A1EAAA5BB00B2C750 /* setup_44.h */, + D0D55C8B1EAAA5BB00B2C750 /* setup_44p51.h */, + D0D55C8C1EAAA5BB00B2C750 /* setup_44u.h */, + D0D55C8D1EAAA5BB00B2C750 /* setup_8.h */, + D0D55C8E1EAAA5BB00B2C750 /* setup_X.h */, + ); + path = modes; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -3262,7 +3518,6 @@ 869FF8B61651518C002FE082 /* Resources */, 869FF8B41651518C002FE082 /* Sources */, 869FF8B51651518C002FE082 /* Frameworks */, - 8645C978188723B7004ED987 /* CopyFiles */, ); buildRules = ( ); @@ -3304,7 +3559,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + D0D55C5A1EAAA5A500B2C750 /* README in Resources */, + D0D55C581EAAA5A500B2C750 /* CHANGES in Resources */, + D0D55C571EAAA5A500B2C750 /* AUTHORS in Resources */, + D0D55CB61EAAA5BB00B2C750 /* lookups.pl in Resources */, 86C281CD16A4307E00F030F4 /* MainMenu.xib in Resources */, + D0D55C591EAAA5A500B2C750 /* COPYING in Resources */, 8652F2A016C146CF00639EFE /* torque2d.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3323,6 +3583,7 @@ 86D770581656873C0046D71F /* mathUtils.cc in Sources */, 86D770591656873C0046D71F /* mBox.cc in Sources */, 86D7705B1656873C0046D71F /* mMath_C.cc in Sources */, + D0D55CBF1EAAA5BB00B2C750 /* smallft.c in Sources */, 86D7705C1656873C0046D71F /* mMathAltivec.cc in Sources */, 86D7705D1656873C0046D71F /* mMathFn.cc in Sources */, 86D7705E1656873C0046D71F /* mMatrix.cc in Sources */, @@ -3340,6 +3601,7 @@ 86D7706B1656873C0046D71F /* scriptMsgListener.cc in Sources */, 86D7706C1656873C0046D71F /* moduleDefinition.cc in Sources */, 86D7706D1656873C0046D71F /* moduleManager.cc in Sources */, + D0D55CB31EAAA5BB00B2C750 /* floor1.c in Sources */, 86D7706E1656873C0046D71F /* moduleMergeDefinition.cc in Sources */, 86D7706F1656873C0046D71F /* networkProcessList.cc in Sources */, 86D770701656873C0046D71F /* connectionProtocol.cc in Sources */, @@ -3373,7 +3635,6 @@ 86D770911656873C0046D71F /* platformFileIO.cc in Sources */, 86D770921656873C0046D71F /* platformFont.cc in Sources */, 86D770931656873C0046D71F /* platformMemory.cc in Sources */, - 86D770941656873C0046D71F /* platformNetAsync.unix.cc in Sources */, 86D770951656873C0046D71F /* platformString.cc in Sources */, 86D770961656873C0046D71F /* platformVideo.cc in Sources */, 86D770971656873C0046D71F /* Tickable.cc in Sources */, @@ -3391,6 +3652,7 @@ 86D770B01656873C0046D71F /* simDictionary.cc in Sources */, 86D770B11656873C0046D71F /* simFieldDictionary.cc in Sources */, 86D770B21656873C0046D71F /* simManager.cc in Sources */, + D0D55CAC1EAAA5BB00B2C750 /* analysis.c in Sources */, 86D770B31656873C0046D71F /* simObject.cc in Sources */, 86D770B41656873C0046D71F /* SimObjectList.cc in Sources */, 86D770B51656873C0046D71F /* simSerialize.cpp in Sources */, @@ -3418,6 +3680,7 @@ 86D7704B165687220046D71F /* streamObject.cc in Sources */, 86D7704C165687220046D71F /* centralDir.cc in Sources */, 86D7704D165687220046D71F /* compressor.cc in Sources */, + D0D55C5C1EAAA5A500B2C750 /* framing.c in Sources */, 86D7704E165687220046D71F /* deflate.cc in Sources */, D000F97C1CB0D16A00C4D097 /* BitmapFontCharacter.cc in Sources */, D000F97B1CB0D16A00C4D097 /* BitmapFont.cc in Sources */, @@ -3427,7 +3690,6 @@ 86D77052165687220046D71F /* zipArchive.cc in Sources */, 86D77053165687220046D71F /* zipCryptStream.cc in Sources */, 86D77054165687220046D71F /* zipObject.cc in Sources */, - 8645C97418872339004ED987 /* leapMotionManager.cc in Sources */, 86D77055165687220046D71F /* zipSubStream.cc in Sources */, 86D77056165687220046D71F /* zipTempStream.cc in Sources */, 86D76FAF165687060046D71F /* crc.cc in Sources */, @@ -3475,6 +3737,8 @@ 86D76FF0165687060046D71F /* bitmapPng.cc in Sources */, 86D76FF3165687060046D71F /* dgl.cc in Sources */, 86D76FF4165687060046D71F /* dglMatrix.cc in Sources */, + D0D55CAE1EAAA5BB00B2C750 /* bitrate.c in Sources */, + D0D55CC01EAAA5BB00B2C750 /* synthesis.c in Sources */, 86D76FF5165687060046D71F /* DynamicTexture.cc in Sources */, 86D76FF6165687060046D71F /* gBitmap.cc in Sources */, 86D76FF7165687060046D71F /* gFont.cc in Sources */, @@ -3488,6 +3752,7 @@ 86D76FFF165687060046D71F /* guiBorderButton.cc in Sources */, 86D77000165687060046D71F /* guiButtonBaseCtrl.cc in Sources */, 86D77001165687060046D71F /* guiButtonCtrl.cc in Sources */, + D0D55CB01EAAA5BB00B2C750 /* codebook.c in Sources */, 86D77002165687060046D71F /* guiCheckBoxCtrl.cc in Sources */, 86D77003165687060046D71F /* guiIconButtonCtrl.cc in Sources */, 86D77004165687060046D71F /* guiRadioCtrl.cc in Sources */, @@ -3527,10 +3792,11 @@ 86D77022165687060046D71F /* guiColorPicker.cc in Sources */, 86D77023165687060046D71F /* guiConsole.cc in Sources */, 86D77024165687060046D71F /* guiConsoleEditCtrl.cc in Sources */, - 8645C97518872339004ED987 /* leapMotionUtil.cpp in Sources */, 86D77025165687060046D71F /* guiConsoleTextCtrl.cc in Sources */, 86D77026165687060046D71F /* guiControl.cc in Sources */, + D0D55CBD1EAAA5BB00B2C750 /* res0.c in Sources */, 86D77027165687060046D71F /* guiDefaultControlRender.cc in Sources */, + D0D55CC21EAAA5BB00B2C750 /* vorbisenc.c in Sources */, 86D77028165687060046D71F /* guiFadeinBitmapCtrl.cc in Sources */, 86D77029165687060046D71F /* guiInputCtrl.cc in Sources */, 86D7702A165687060046D71F /* guiListBoxCtrl.cc in Sources */, @@ -3549,6 +3815,7 @@ 86D77037165687060046D71F /* guiTextEditSliderCtrl.cc in Sources */, 86D77038165687060046D71F /* guiTextListCtrl.cc in Sources */, 86D77039165687060046D71F /* guiTickCtrl.cc in Sources */, + D0D55CBE1EAAA5BB00B2C750 /* sharedbook.c in Sources */, 86D7703A165687060046D71F /* guiTreeViewCtrl.cc in Sources */, 86D7703B165687060046D71F /* guiTypes.cc in Sources */, 86D7703C165687060046D71F /* lang.cc in Sources */, @@ -3579,6 +3846,7 @@ 86D76F97165686B00046D71F /* ShapeVector.cc in Sources */, 86D76F98165686B00046D71F /* Sprite.cc in Sources */, 86D76F99165686B00046D71F /* Trigger.cc in Sources */, + D0D55CC31EAAA5BB00B2C750 /* vorbisfile.c in Sources */, 86D76F791656868D0046D71F /* AnimationAsset.cc in Sources */, 86D76F7B1656868D0046D71F /* ImageAsset.cc in Sources */, 86D76F7C1656868D0046D71F /* BatchRender.cc in Sources */, @@ -3596,6 +3864,7 @@ 86D76F891656868D0046D71F /* ContactFilter.cc in Sources */, 86D76F8A1656868D0046D71F /* DebugDraw.cc in Sources */, 86D76F8B1656868D0046D71F /* Scene.cc in Sources */, + D0D55CB41EAAA5BB00B2C750 /* info.c in Sources */, 86D76F8C1656868D0046D71F /* WorldQuery.cc in Sources */, 866381D31655484400C8C551 /* mRandom.cc in Sources */, 865A227B165187B600527C44 /* b2BroadPhase.cpp in Sources */, @@ -3608,11 +3877,13 @@ 865A2282165187B600527C44 /* b2TimeOfImpact.cpp in Sources */, 865A2283165187B600527C44 /* b2ChainShape.cpp in Sources */, 865A2284165187B600527C44 /* b2CircleShape.cpp in Sources */, + 2B4314C41F1D024900A5C0B7 /* platformNetAsync.cpp in Sources */, 865A2285165187B600527C44 /* b2EdgeShape.cpp in Sources */, 865A2286165187B600527C44 /* b2PolygonShape.cpp in Sources */, 865A2287165187B600527C44 /* b2BlockAllocator.cpp in Sources */, 865A2288165187B600527C44 /* b2Draw.cpp in Sources */, 865A2289165187B600527C44 /* b2Math.cpp in Sources */, + D0D55CB71EAAA5BB00B2C750 /* lpc.c in Sources */, 865A228A165187B600527C44 /* b2Settings.cpp in Sources */, 865A228B165187B600527C44 /* b2StackAllocator.cpp in Sources */, 865A228C165187B600527C44 /* b2Timer.cpp in Sources */, @@ -3629,12 +3900,14 @@ 27908E0D18A3F8CB002D41BD /* Skin.c in Sources */, 865A2296165187B600527C44 /* b2Contact.cpp in Sources */, 865A2297165187B600527C44 /* b2ContactSolver.cpp in Sources */, + D0D55CBB1EAAA5BB00B2C750 /* psy.c in Sources */, 865A2298165187B600527C44 /* b2EdgeAndCircleContact.cpp in Sources */, 865A2299165187B600527C44 /* b2EdgeAndPolygonContact.cpp in Sources */, 865A229A165187B600527C44 /* b2PolygonAndCircleContact.cpp in Sources */, 865A229B165187B600527C44 /* b2PolygonContact.cpp in Sources */, 865A229C165187B600527C44 /* b2DistanceJoint.cpp in Sources */, 27908DFD18A3F8CB002D41BD /* Atlas.c in Sources */, + D0D55CC41EAAA5BB00B2C750 /* window.c in Sources */, 865A229D165187B600527C44 /* b2FrictionJoint.cpp in Sources */, 865A229E165187B600527C44 /* b2GearJoint.cpp in Sources */, 865A229F165187B600527C44 /* b2Joint.cpp in Sources */, @@ -3651,7 +3924,9 @@ 865A2305165187FF00527C44 /* jcapimin.c in Sources */, 865A2306165187FF00527C44 /* jcapistd.c in Sources */, 865A2307165187FF00527C44 /* jccoefct.c in Sources */, + D0D55C5B1EAAA5A500B2C750 /* bitwise.c in Sources */, 865A2308165187FF00527C44 /* jccolor.c in Sources */, + D0D55CB81EAAA5BB00B2C750 /* lsp.c in Sources */, 865A2309165187FF00527C44 /* jcdctmgr.c in Sources */, 865A230A165187FF00527C44 /* jchuff.c in Sources */, 865A230B165187FF00527C44 /* jcinit.c in Sources */, @@ -3675,6 +3950,7 @@ 865A231C165187FF00527C44 /* jdhuff.c in Sources */, 865A231D165187FF00527C44 /* jdinput.c in Sources */, 865A231E165187FF00527C44 /* jdmainct.c in Sources */, + D0D55CB21EAAA5BB00B2C750 /* floor0.c in Sources */, 865A231F165187FF00527C44 /* jdmarker.c in Sources */, 865A2320165187FF00527C44 /* jdmaster.c in Sources */, 865A2321165187FF00527C44 /* jdmerge.c in Sources */, @@ -3705,10 +3981,14 @@ 865A23451651881300527C44 /* pngmem.c in Sources */, 865A23461651881300527C44 /* pngpread.c in Sources */, 865A23471651881300527C44 /* pngread.c in Sources */, + 2B4314C31F1D024900A5C0B7 /* platformNet.cpp in Sources */, 865A23481651881300527C44 /* pngrio.c in Sources */, 865A23491651881300527C44 /* pngrtran.c in Sources */, + D0D55CB11EAAA5BB00B2C750 /* envelope.c in Sources */, 865A234A1651881300527C44 /* pngrutil.c in Sources */, + D0D55CB91EAAA5BB00B2C750 /* mapping0.c in Sources */, 865A234B1651881300527C44 /* pngset.c in Sources */, + D0D55CB51EAAA5BB00B2C750 /* lookup.c in Sources */, 865A234C1651881300527C44 /* pngtrans.c in Sources */, 865A234D1651881300527C44 /* pngwio.c in Sources */, 865A234E1651881300527C44 /* pngwrite.c in Sources */, @@ -3716,6 +3996,7 @@ 865A23501651881300527C44 /* pngwutil.c in Sources */, 865A235A16518AD300527C44 /* AppDelegate.mm in Sources */, 865A235B16518AD300527C44 /* main.mm in Sources */, + D0D55CAF1EAAA5BB00B2C750 /* block.c in Sources */, 86063A251654180000362D83 /* platformOSX.mm in Sources */, 866381D8165550FF00C8C551 /* osxFileIO.mm in Sources */, 27908E0B18A3F8CB002D41BD /* SkeletonData.c in Sources */, @@ -3723,6 +4004,7 @@ 866381DC165556AD00C8C551 /* osxMath.mm in Sources */, 866381E51655615200C8C551 /* osxInput.mm in Sources */, 866381E91655674B00C8C551 /* osxTime.mm in Sources */, + 2B5F12AC1F1DBC7C006D2B4F /* byteBuffer.cpp in Sources */, 8609FE2F16556DD2004662ED /* osxSemaphore.mm in Sources */, 8609FE3116556E5A004662ED /* osxThread.mm in Sources */, 8609FE361655716E004662ED /* osxPopupMenu.mm in Sources */, @@ -3736,9 +4018,9 @@ 27908E0C18A3F8CB002D41BD /* SkeletonJson.c in Sources */, 8694ADD51656BDE60080ABAC /* osxGL.mm in Sources */, 8658B174165A7BFB0087ABC1 /* osxCPU.mm in Sources */, - 8658B175165A7BFB0087ABC1 /* osxNetwork.mm in Sources */, 27908E0318A3F8CB002D41BD /* BoundingBoxAttachment.c in Sources */, 8658B176165A7BFB0087ABC1 /* osxString.mm in Sources */, + 2B4314C21F1D024900A5C0B7 /* platformNet_ScriptBinding.cc in Sources */, 86EC5AC7165C1E0100757872 /* osxTorqueView.mm in Sources */, 2A03300D165D1D2100E9CD70 /* unitTesting.cc in Sources */, 2A033011165D1D4100E9CD70 /* platformFileIoTests.cc in Sources */, @@ -3746,6 +4028,7 @@ 2AC5C7E81667C85700A0D046 /* platformStringTests.cc in Sources */, 2ACFC0A8166CE1AB00FE7370 /* platformMemoryTests.cc in Sources */, 865BD2F9166FA7F80064F595 /* osxInputManager.mm in Sources */, + D0D55CBC1EAAA5BB00B2C750 /* registry.c in Sources */, 86EA5B401678C7C700598E68 /* osxCocoaUtilities.mm in Sources */, 861CD8D01678F6C200DAE1A0 /* fileDialog.cc in Sources */, 2AE851D21681E56E00193F17 /* color.cc in Sources */, @@ -3764,6 +4047,7 @@ 2AB14A0516D7CDC300EABBF2 /* PointForceController.cc in Sources */, 2AB4C19E16DE9F0600B02479 /* GroupedSceneController.cc in Sources */, 2AB4C19F16DE9F0600B02479 /* PickingSceneController.cc in Sources */, + D0D55CBA1EAAA5BB00B2C750 /* mdct.c in Sources */, 2AB4C1A316DE9F1100B02479 /* AmbientForceController.cc in Sources */, 2ACF5A2816E52D4B00F838D9 /* SpriteBatchQuery.cc in Sources */, 2AE2938516EF4C220015E200 /* WaveComposite.cc in Sources */, @@ -3780,7 +4064,6 @@ 86DE5688171F05F60054CB83 /* guiGridCtrl.cc in Sources */, B350D12F174ED1FE00033EBB /* math_ScriptBinding.cc in Sources */, B350D131174ED23E00033EBB /* frameAllocator_ScriptBinding.cc in Sources */, - B350D147174ED56500033EBB /* platformNetwork_ScriptBinding.cc in Sources */, B350D158174EF62400033EBB /* fileSystem_ScriptBinding.cc in Sources */, B350D164174EF71B00033EBB /* metaScripting_ScriptBinding.cc in Sources */, B350D172174EF91900033EBB /* audio_ScriptBinding.cc in Sources */, @@ -3834,6 +4117,7 @@ CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = ../../..; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Torque2D/Torque2D-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3845,21 +4129,18 @@ ../../source, ../../lib, ../../lib/libvorbis/include, + ../../lib/libogg/include, ../../lib/lpng, ../../lib/ljpeg, - ../../lib/lungif, ../../source/persistence/rapidjson/include, + ../../source/testing/googleTest, + ../../source/testing/googleTest/include, "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers", "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", - ../../lib/LeapSDK/include, - ../../lib/libogg/include, + ../../lib/libvorbis/lib, ); INFOPLIST_FILE = "Torque2D/Torque2D-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../lib/LeapSDK/lib/libc++", - /usr/local/lib, - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = /usr/lib/libz.dylib; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3939,6 +4220,7 @@ CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = ../../..; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Torque2D/Torque2D-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3950,23 +4232,18 @@ ../../source, ../../lib, ../../lib/libvorbis/include, + ../../lib/libogg/include, ../../lib/lpng, ../../lib/ljpeg, - ../../lib/lungif, ../../source/persistence/rapidjson/include, ../../source/testing/googleTest, ../../source/testing/googleTest/include, "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers", "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", - ../../lib/LeapSDK/include, - ../../lib/libogg/include, + ../../lib/libvorbis/lib, ); INFOPLIST_FILE = "Torque2D/Torque2D-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../lib/LeapSDK/lib/libc++", - /usr/local/lib, - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = /usr/lib/libz.dylib; PRODUCT_NAME = "$(TARGET_NAME)_DEBUG"; @@ -3981,6 +4258,7 @@ CLANG_CXX_LIBRARY = "libc++"; COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = ../../..; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Torque2D/Torque2D-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3993,38 +4271,18 @@ ../../source, ../../lib, ../../lib/libvorbis/include, - ../../lib/lpng, - ../../lib/ljpeg, - ../../lib/lungif, - ../../source/persistence/rapidjson/include, - ../../source/testing/googleTest, - ../../source/testing/googleTest/include, - "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers", - "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", - ../../lib/LeapSDK/include, ../../lib/libogg/include, - ); - "HEADER_SEARCH_PATHS[arch=*]" = ( - ../../source, - ../../lib, - ../../lib/libvorbis/include, ../../lib/lpng, ../../lib/ljpeg, - ../../lib/lungif, ../../source/persistence/rapidjson/include, ../../source/testing/googleTest, ../../source/testing/googleTest/include, "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers", "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", - ../../lib/LeapSDK/include, - ../../lib/libogg/include, + ../../lib/libvorbis/lib, ); INFOPLIST_FILE = "Torque2D/Torque2D-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../lib/LeapSDK/lib/libc++", - /usr/local/lib, - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = /usr/lib/libz.dylib; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj b/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj index c5a1802c9..83e4169b2 100644 --- a/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj +++ b/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj @@ -54,6 +54,10 @@ 2AED7D9316B70102003482CF /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AED7D9216B70102003482CF /* CoreText.framework */; }; 2AF1C54B16B439D900C1CF3A /* declaredAssets.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AF1C54716B439D900C1CF3A /* declaredAssets.cc */; }; 2AF1C54C16B439D900C1CF3A /* referencedAssets.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AF1C54916B439D900C1CF3A /* referencedAssets.cc */; }; + 2B9F16D21F1CF25400B18D6B /* byteBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9F16D01F1CF25400B18D6B /* byteBuffer.cpp */; }; + 2B9F16D91F1CF33F00B18D6B /* platformNet_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2B9F16D41F1CF33F00B18D6B /* platformNet_ScriptBinding.cc */; }; + 2B9F16DA1F1CF33F00B18D6B /* platformNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9F16D51F1CF33F00B18D6B /* platformNet.cpp */; }; + 2B9F16DB1F1CF33F00B18D6B /* platformNetAsync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9F16D71F1CF33F00B18D6B /* platformNetAsync.cpp */; }; 33230F1656FA2C7C493DA2D2 /* guiSliderCtrl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 332307DBC5B7EEEB22E5A736 /* guiSliderCtrl.cc */; }; 860A196C171F0666000E9FE8 /* guiGridCtrl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 860A196A171F0666000E9FE8 /* guiGridCtrl.cc */; }; 8610F32F16AEEC670015BCEB /* main.cs in Resources */ = {isa = PBXBuildFile; fileRef = 8610F32D16AEEC670015BCEB /* main.cs */; }; @@ -83,7 +87,6 @@ 867BACE116AEC8BB0033868F /* iOSMotionManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACAC16AEC8BB0033868F /* iOSMotionManager.mm */; }; 867BACE216AEC8BB0033868F /* iOSMoviePlayback.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACAE16AEC8BB0033868F /* iOSMoviePlayback.mm */; }; 867BACE316AEC8BB0033868F /* iOSMutex.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACAF16AEC8BB0033868F /* iOSMutex.mm */; }; - 867BACE416AEC8BB0033868F /* iOSNet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACB016AEC8BB0033868F /* iOSNet.mm */; }; 867BACE516AEC8BB0033868F /* iOSOGLVideo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACB316AEC8BB0033868F /* iOSOGLVideo.mm */; }; 867BACE616AEC8BB0033868F /* iOSOutlineGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACB516AEC8BB0033868F /* iOSOutlineGL.mm */; }; 867BACE716AEC8BB0033868F /* iOSPlatform.mm in Sources */ = {isa = PBXBuildFile; fileRef = 867BACB616AEC8BB0033868F /* iOSPlatform.mm */; }; @@ -345,7 +348,6 @@ 867BB0F916AEC9050033868F /* platformFileIO.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAF8D16AEC9050033868F /* platformFileIO.cc */; }; 867BB0FA16AEC9050033868F /* platformFont.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAF8F16AEC9050033868F /* platformFont.cc */; }; 867BB0FB16AEC9050033868F /* platformMemory.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAF9516AEC9050033868F /* platformMemory.cc */; }; - 867BB0FC16AEC9050033868F /* platformNetAsync.unix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAF9716AEC9050033868F /* platformNetAsync.unix.cc */; }; 867BB0FE16AEC9050033868F /* platformString.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAF9C16AEC9050033868F /* platformString.cc */; }; 867BB0FF16AEC9050033868F /* platformVideo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAFA116AEC9050033868F /* platformVideo.cc */; }; 867BB10016AEC9050033868F /* Tickable.cc in Sources */ = {isa = PBXBuildFile; fileRef = 867BAFA716AEC9050033868F /* Tickable.cc */; }; @@ -506,7 +508,6 @@ B350D19B174F060700033EBB /* fileSystem_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D199174F060700033EBB /* fileSystem_ScriptBinding.cc */; }; B350D1A3174F063200033EBB /* math_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D19F174F063200033EBB /* math_ScriptBinding.cc */; }; B350D1A5174F064000033EBB /* frameAllocator_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D1A4174F064000033EBB /* frameAllocator_ScriptBinding.cc */; }; - B350D1BB174F06B700033EBB /* platformNetwork_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D1B8174F06B700033EBB /* platformNetwork_ScriptBinding.cc */; }; D000F9881CB0D44600C4D097 /* TextSprite.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9861CB0D44600C4D097 /* TextSprite.cc */; }; D000F98C1CB0D46D00C4D097 /* FontAsset.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F98A1CB0D46D00C4D097 /* FontAsset.cc */; }; D000F9941CB0D48600C4D097 /* BitmapFont.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F98E1CB0D48600C4D097 /* BitmapFont.cc */; }; @@ -638,6 +639,17 @@ 2AF1C54816B439D900C1CF3A /* declaredAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = declaredAssets.h; sourceTree = ""; }; 2AF1C54916B439D900C1CF3A /* referencedAssets.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = referencedAssets.cc; sourceTree = ""; }; 2AF1C54A16B439D900C1CF3A /* referencedAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = referencedAssets.h; sourceTree = ""; }; + 2B9F16D01F1CF25400B18D6B /* byteBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = byteBuffer.cpp; sourceTree = ""; }; + 2B9F16D11F1CF25400B18D6B /* byteBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = byteBuffer.h; sourceTree = ""; }; + 2B9F16D31F1CF26F00B18D6B /* rawData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rawData.h; sourceTree = ""; }; + 2B9F16D41F1CF33F00B18D6B /* platformNet_ScriptBinding.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNet_ScriptBinding.cc; sourceTree = ""; }; + 2B9F16D51F1CF33F00B18D6B /* platformNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNet.cpp; sourceTree = ""; }; + 2B9F16D61F1CF33F00B18D6B /* platformNet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNet.h; sourceTree = ""; }; + 2B9F16D71F1CF33F00B18D6B /* platformNetAsync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetAsync.cpp; sourceTree = ""; }; + 2B9F16D81F1CF33F00B18D6B /* platformNetAsync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetAsync.h; sourceTree = ""; }; + 2B9F16DC1F1CF35100B18D6B /* tmm_off.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmm_off.h; sourceTree = ""; }; + 2B9F16DD1F1CF35100B18D6B /* tmm_on.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmm_on.h; sourceTree = ""; }; + 2B9F16DE1F1CF35100B18D6B /* typetraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typetraits.h; sourceTree = ""; }; 332307DBC5B7EEEB22E5A736 /* guiSliderCtrl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guiSliderCtrl.cc; sourceTree = ""; }; 33230911303CCA4C673E1A22 /* guiSliderCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guiSliderCtrl.h; sourceTree = ""; }; 860A196A171F0666000E9FE8 /* guiGridCtrl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guiGridCtrl.cc; sourceTree = ""; }; @@ -680,7 +692,6 @@ 867BACAD16AEC8BB0033868F /* iOSMoviePlayback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iOSMoviePlayback.h; sourceTree = ""; }; 867BACAE16AEC8BB0033868F /* iOSMoviePlayback.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSMoviePlayback.mm; sourceTree = ""; }; 867BACAF16AEC8BB0033868F /* iOSMutex.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSMutex.mm; sourceTree = ""; }; - 867BACB016AEC8BB0033868F /* iOSNet.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSNet.mm; sourceTree = ""; }; 867BACB116AEC8BB0033868F /* iOSNPatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iOSNPatch.h; sourceTree = ""; }; 867BACB216AEC8BB0033868F /* iOSOGLVideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iOSOGLVideo.h; sourceTree = ""; }; 867BACB316AEC8BB0033868F /* iOSOGLVideo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSOGLVideo.mm; sourceTree = ""; }; @@ -1265,9 +1276,6 @@ 867BAF9416AEC9050033868F /* platformMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformMath.h; sourceTree = ""; }; 867BAF9516AEC9050033868F /* platformMemory.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformMemory.cc; sourceTree = ""; }; 867BAF9616AEC9050033868F /* platformMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformMemory.h; sourceTree = ""; }; - 867BAF9716AEC9050033868F /* platformNetAsync.unix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetAsync.unix.cc; sourceTree = ""; }; - 867BAF9816AEC9050033868F /* platformNetAsync.unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetAsync.unix.h; sourceTree = ""; }; - 867BAF9A16AEC9050033868F /* platformNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformNetwork.h; sourceTree = ""; }; 867BAF9B16AEC9050033868F /* platformSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformSemaphore.h; sourceTree = ""; }; 867BAF9C16AEC9050033868F /* platformString.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformString.cc; sourceTree = ""; }; 867BAF9D16AEC9050033868F /* platformString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformString.h; sourceTree = ""; }; @@ -1572,7 +1580,6 @@ B350D1B5174F06B700033EBB /* CursorManager_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CursorManager_ScriptBinding.h; sourceTree = ""; }; B350D1B6174F06B700033EBB /* platformAssert_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformAssert_ScriptBinding.h; sourceTree = ""; }; B350D1B7174F06B700033EBB /* platformFileIO_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformFileIO_ScriptBinding.h; sourceTree = ""; }; - B350D1B8174F06B700033EBB /* platformNetwork_ScriptBinding.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platformNetwork_ScriptBinding.cc; sourceTree = ""; }; B350D1B9174F06B700033EBB /* platformString_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformString_ScriptBinding.h; sourceTree = ""; }; B350D1BA174F06B700033EBB /* platformVideo_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platformVideo_ScriptBinding.h; sourceTree = ""; }; B350D1BC174F06C000033EBB /* msgBox_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msgBox_ScriptBinding.h; sourceTree = ""; }; @@ -1832,7 +1839,6 @@ 867BACAD16AEC8BB0033868F /* iOSMoviePlayback.h */, 867BACAE16AEC8BB0033868F /* iOSMoviePlayback.mm */, 867BACAF16AEC8BB0033868F /* iOSMutex.mm */, - 867BACB016AEC8BB0033868F /* iOSNet.mm */, 867BACB116AEC8BB0033868F /* iOSNPatch.h */, 867BACB216AEC8BB0033868F /* iOSOGLVideo.h */, 867BACB316AEC8BB0033868F /* iOSOGLVideo.mm */, @@ -2510,6 +2516,9 @@ 867BAEBE16AEC9050033868F /* io */ = { isa = PBXGroup; children = ( + 2B9F16D31F1CF26F00B18D6B /* rawData.h */, + 2B9F16D01F1CF25400B18D6B /* byteBuffer.cpp */, + 2B9F16D11F1CF25400B18D6B /* byteBuffer.h */, B350D197174F060700033EBB /* fileObject_ScriptBinding.h */, B350D198174F060700033EBB /* fileStreamObject_ScriptBinding.h */, B350D199174F060700033EBB /* fileSystem_ScriptBinding.cc */, @@ -2779,10 +2788,17 @@ 867BAF7216AEC9050033868F /* platform */ = { isa = PBXGroup; children = ( + 2B9F16DC1F1CF35100B18D6B /* tmm_off.h */, + 2B9F16DD1F1CF35100B18D6B /* tmm_on.h */, + 2B9F16DE1F1CF35100B18D6B /* typetraits.h */, + 2B9F16D41F1CF33F00B18D6B /* platformNet_ScriptBinding.cc */, + 2B9F16D51F1CF33F00B18D6B /* platformNet.cpp */, + 2B9F16D61F1CF33F00B18D6B /* platformNet.h */, + 2B9F16D71F1CF33F00B18D6B /* platformNetAsync.cpp */, + 2B9F16D81F1CF33F00B18D6B /* platformNetAsync.h */, B350D1B5174F06B700033EBB /* CursorManager_ScriptBinding.h */, B350D1B6174F06B700033EBB /* platformAssert_ScriptBinding.h */, B350D1B7174F06B700033EBB /* platformFileIO_ScriptBinding.h */, - B350D1B8174F06B700033EBB /* platformNetwork_ScriptBinding.cc */, B350D1B9174F06B700033EBB /* platformString_ScriptBinding.h */, B350D1BA174F06B700033EBB /* platformVideo_ScriptBinding.h */, 867BAF7316AEC9050033868F /* CursorManager.cc */, @@ -2813,9 +2829,6 @@ 867BAF9416AEC9050033868F /* platformMath.h */, 867BAF9516AEC9050033868F /* platformMemory.cc */, 867BAF9616AEC9050033868F /* platformMemory.h */, - 867BAF9716AEC9050033868F /* platformNetAsync.unix.cc */, - 867BAF9816AEC9050033868F /* platformNetAsync.unix.h */, - 867BAF9A16AEC9050033868F /* platformNetwork.h */, 867BAF9B16AEC9050033868F /* platformSemaphore.h */, 867BAF9C16AEC9050033868F /* platformString.cc */, 867BAF9D16AEC9050033868F /* platformString.h */, @@ -3399,7 +3412,6 @@ 867BACE116AEC8BB0033868F /* iOSMotionManager.mm in Sources */, 867BACE216AEC8BB0033868F /* iOSMoviePlayback.mm in Sources */, 867BACE316AEC8BB0033868F /* iOSMutex.mm in Sources */, - 867BACE416AEC8BB0033868F /* iOSNet.mm in Sources */, 867BACE516AEC8BB0033868F /* iOSOGLVideo.mm in Sources */, 867BACE616AEC8BB0033868F /* iOSOutlineGL.mm in Sources */, 867BACE716AEC8BB0033868F /* iOSPlatform.mm in Sources */, @@ -3455,6 +3467,7 @@ 867BB00716AEC9050033868F /* assetBase.cc in Sources */, 867BB00816AEC9050033868F /* assetFieldTypes.cc in Sources */, 867BB00916AEC9050033868F /* assetManager.cc in Sources */, + 2B9F16DB1F1CF33F00B18D6B /* platformNetAsync.cpp in Sources */, 867BB00B16AEC9050033868F /* assetQuery.cc in Sources */, 867BB00D16AEC9050033868F /* assetTagsManifest.cc in Sources */, 867BB00E16AEC9050033868F /* audio.cc in Sources */, @@ -3498,6 +3511,7 @@ 867BB03E16AEC9050033868F /* Package.cc in Sources */, 867BB03F16AEC9050033868F /* profiler.cc in Sources */, 867BB04016AEC9050033868F /* RemoteDebugger1.cc in Sources */, + 2B9F16DA1F1CF33F00B18D6B /* platformNet.cpp in Sources */, 867BB04116AEC9050033868F /* RemoteDebuggerBase.cc in Sources */, 867BB04216AEC9050033868F /* RemoteDebuggerBridge.cc in Sources */, 867BB04316AEC9050033868F /* telnetDebugger.cc in Sources */, @@ -3517,6 +3531,7 @@ 867BB05116AEC9050033868F /* DynamicTexture.cc in Sources */, 867BB05216AEC9050033868F /* gBitmap.cc in Sources */, 867BB05316AEC9050033868F /* gFont.cc in Sources */, + 2B9F16D91F1CF33F00B18D6B /* platformNet_ScriptBinding.cc in Sources */, 867BB05416AEC9050033868F /* gPalette.cc in Sources */, 867BB05516AEC9050033868F /* PNGImage.cpp in Sources */, 867BB05616AEC9050033868F /* splineUtil.cc in Sources */, @@ -3583,6 +3598,7 @@ 867BB09016AEC9050033868F /* guiTabPageCtrl.cc in Sources */, 867BB09116AEC9050033868F /* guiTextCtrl.cc in Sources */, 867BB09216AEC9050033868F /* guiTextEditCtrl.cc in Sources */, + 2B9F16D21F1CF25400B18D6B /* byteBuffer.cpp in Sources */, 867BB09316AEC9050033868F /* guiTextEditSliderCtrl.cc in Sources */, 867BB09416AEC9050033868F /* guiTextListCtrl.cc in Sources */, 867BB09516AEC9050033868F /* guiTickCtrl.cc in Sources */, @@ -3679,7 +3695,6 @@ 867BB0F916AEC9050033868F /* platformFileIO.cc in Sources */, 867BB0FA16AEC9050033868F /* platformFont.cc in Sources */, 867BB0FB16AEC9050033868F /* platformMemory.cc in Sources */, - 867BB0FC16AEC9050033868F /* platformNetAsync.unix.cc in Sources */, 867BB0FE16AEC9050033868F /* platformString.cc in Sources */, 867BB0FF16AEC9050033868F /* platformVideo.cc in Sources */, 867BB10016AEC9050033868F /* Tickable.cc in Sources */, @@ -3852,7 +3867,6 @@ B350D19B174F060700033EBB /* fileSystem_ScriptBinding.cc in Sources */, B350D1A3174F063200033EBB /* math_ScriptBinding.cc in Sources */, B350D1A5174F064000033EBB /* frameAllocator_ScriptBinding.cc in Sources */, - B350D1BB174F06B700033EBB /* platformNetwork_ScriptBinding.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3958,7 +3972,7 @@ "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", ); INFOPLIST_FILE = "Torque2D/Torque2D-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -3982,7 +3996,7 @@ "$(SYSTEM_LIBRARY_DIR)/Frameworks/OpenGL.framework/Headers", ); INFOPLIST_FILE = "Torque2D/Torque2D-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; diff --git a/engine/compilers/android-studio/android-studio.iml b/engine/compilers/android-studio/android-studio.iml index bc141810c..8773d6e92 100644 --- a/engine/compilers/android-studio/android-studio.iml +++ b/engine/compilers/android-studio/android-studio.iml @@ -1,5 +1,5 @@ - + @@ -8,12 +8,12 @@ - + - + \ No newline at end of file diff --git a/engine/compilers/android-studio/app/app.iml b/engine/compilers/android-studio/app/app.iml index a2963302b..7e17ffac9 100644 --- a/engine/compilers/android-studio/app/app.iml +++ b/engine/compilers/android-studio/app/app.iml @@ -1,21 +1,22 @@ - + + + + + - + - + + + + @@ -50,13 +54,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -64,26 +95,201 @@ - + - - + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/engine/compilers/android-studio/app/build.gradle b/engine/compilers/android-studio/app/build.gradle index 941ed0d8c..c6c854964 100644 --- a/engine/compilers/android-studio/app/build.gradle +++ b/engine/compilers/android-studio/app/build.gradle @@ -1,45 +1,30 @@ apply plugin: 'com.android.application' - -import org.apache.tools.ant.taskdefs.condition.Os - android { - compileSdkVersion 22 - buildToolsVersion "23.0.2" - + compileSdkVersion 25 + buildToolsVersion '26.0.2' + externalNativeBuild { + ndkBuild { + path './src/main/jni/Android.mk' + } + } defaultConfig { applicationId "com.garagegames.torque2d" - minSdkVersion 22 - targetSdkVersion 22 + minSdkVersion 19 + targetSdkVersion 25 sourceSets.main { - assets.srcDirs=[ + assets.srcDirs = [ 'src/main/assets', 'src/main/game' ] - jni.srcDirs = ['../../../source/'] - jniLibs.srcDir 'src/main/libs' - } - task buildNative(type: Exec, description: 'Compile JNI source via NDK') { - def ndkDir = plugins.getPlugin('com.android.application').sdkHandler.getNdkFolder() - def extension = (Os.isFamily(Os.FAMILY_WINDOWS))? '.cmd' : '' - commandLine "$ndkDir/ndk-build" + extension, - '-C', file('src/main/jni').absolutePath, - '-j', Runtime.runtime.availableProcessors(), - 'all', - 'NDK_DEBUG=1' - } - - task cleanNative(type: Exec, description: 'Clean JNI object files') { - def ndkDir = plugins.getPlugin('com.android.application').sdkHandler.getNdkFolder() - def extension = (Os.isFamily(Os.FAMILY_WINDOWS))? '.cmd' : '' - commandLine "$ndkDir/ndk-build" + extension, - '-C', file('src/main/jni').absolutePath, - 'clean' + ndk { + abiFilters 'x86', 'x86_64', 'armeabi-v7a' + } } - task copyGame(type: Copy, description: 'Copy torque scripts and modules'){ - from('../../../../'){ + task copyGame(type: Copy, description: 'Copy torque scripts and modules') { + from('../../../../') { include '**' exclude 'engine/**' exclude 'tools/**' @@ -58,30 +43,26 @@ android { } - task wipeGame(type: Delete, description: 'Wipe android-specific copy of torque scripts and modules'){ + task wipeGame(type: Delete, description: 'Wipe android-specific copy of torque scripts and modules') { delete 'src/main/game/' } - clean.dependsOn 'cleanNative' clean.dependsOn 'wipeGame' tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyGame } - tasks.withType(JavaCompile) { - compileTask -> compileTask.dependsOn buildNative - } - tasks.withType(com.android.build.gradle.tasks.NdkCompile){task-> - task.enabled = false - } - } + } buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - + productFlavors { + } } + +dependencies { +} \ No newline at end of file diff --git a/engine/compilers/android-studio/app/src/main/AndroidManifest.xml b/engine/compilers/android-studio/app/src/main/AndroidManifest.xml index 519d15294..5bbc7ea30 100644 --- a/engine/compilers/android-studio/app/src/main/AndroidManifest.xml +++ b/engine/compilers/android-studio/app/src/main/AndroidManifest.xml @@ -7,10 +7,6 @@ - - diff --git a/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/FileWalker.java b/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/FileWalker.java index 4edd53541..eec9647d8 100644 --- a/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/FileWalker.java +++ b/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/FileWalker.java @@ -1,6 +1,12 @@ package com.garagegames.torque2d; +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.util.Hashtable; import java.util.Vector; @@ -331,6 +337,29 @@ public static int GetFileSize(Context context, String file) return ret; } + public static String LoadInternalFile(Context context, String fileName) + { + try { + FileInputStream fis = new FileInputStream(new File(fileName)); + DataInputStream in = new DataInputStream(fis); + BufferedReader inputReader = new BufferedReader(new InputStreamReader(in)); + String inputString; + StringBuilder sb = new StringBuilder(); + while ((inputString = inputReader.readLine()) != null) { + sb.append(inputString); + } + fis.close(); + inputReader.close(); + in.close(); + + return sb.toString(); + + } catch (IOException e) { + e.printStackTrace(); + return ""; + } + } + public static void OpenURL(Context context, String url) { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); diff --git a/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java b/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java index 8cc201116..7230bcf9e 100644 --- a/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java +++ b/engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java @@ -2,6 +2,8 @@ import android.app.NativeActivity; import android.view.View; +import android.os.Bundle; + public class MyNativeActivity extends NativeActivity { static { @@ -20,4 +22,16 @@ public void onWindowFocusChanged(boolean hasFocus) { | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);} } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } } diff --git a/engine/compilers/android-studio/app/src/main/jni/Android.mk b/engine/compilers/android-studio/app/src/main/jni/Android.mk index 22b941a0d..989c80ec7 100644 --- a/engine/compilers/android-studio/app/src/main/jni/Android.mk +++ b/engine/compilers/android-studio/app/src/main/jni/Android.mk @@ -35,7 +35,7 @@ LOCAL_PATH := $(MY_LOCAL_PATH) include $(CLEAR_VARS) LOCAL_MODULE := freetype-prebuilt -LOCAL_SRC_FILES := ../../../../../../lib/freetype/android/lib/libfreetype.a +LOCAL_SRC_FILES := ../../../../../../lib/freetype/android/lib/$(TARGET_ARCH_ABI)/libfreetype.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../../../lib/freetype/android/include $(LOCAL_PATH)/../../../../../../lib/freetype/android/include/freetype2 include $(PREBUILT_STATIC_LIBRARY) @@ -380,6 +380,7 @@ LOCAL_SRC_FILES := ../../../../../../lib/ljpeg/jcapimin.c \ ../../../../../../source/gui/language/lang.cc \ ../../../../../../source/gui/messageVector.cc \ ../../../../../../source/input/actionMap.cc \ + ../../../../../../source/io/byteBuffer.cpp \ ../../../../../../source/io/bitStream.cc \ ../../../../../../source/io/bufferStream.cc \ ../../../../../../source/io/fileObject.cc \ @@ -493,13 +494,15 @@ LOCAL_SRC_FILES := ../../../../../../lib/ljpeg/jcapimin.c \ ../../../../../../source/platform/platformFileIO.cc \ ../../../../../../source/platform/platformFont.cc \ ../../../../../../source/platform/platformMemory.cc \ - ../../../../../../source/platform/platformNetwork_ScriptBinding.cc \ + ../../../../../../source/platform/platformNet.cpp \ + ../../../../../../source/platform/platformNetAsync.cpp \ + ../../../../../../source/platform/platformNet_ScriptBinding.cc \ ../../../../../../source/platform/platformString.cc \ ../../../../../../source/platform/platformVideo.cc \ - ../../../../../../source/platform/platformNetAsync.unix.cc \ ../../../../../../source/platform/menus/popupMenu.cc \ ../../../../../../source/platform/nativeDialogs/msgBox.cpp \ ../../../../../../source/platform/Tickable.cc \ + ../../../../../../source/platformAndroid/android_native_app_glue.c \ ../../../../../../source/platformAndroid/AndroidAlerts.cpp \ ../../../../../../source/platformAndroid/AndroidAudio.cpp \ ../../../../../../source/platformAndroid/AndroidConsole.cpp \ @@ -514,7 +517,6 @@ LOCAL_SRC_FILES := ../../../../../../lib/ljpeg/jcapimin.c \ ../../../../../../source/platformAndroid/AndroidMath.cpp \ ../../../../../../source/platformAndroid/AndroidMemory.cpp \ ../../../../../../source/platformAndroid/AndroidMutex.cpp \ - ../../../../../../source/platformAndroid/AndroidNet.cpp \ ../../../../../../source/platformAndroid/AndroidOGLVideo.cpp \ ../../../../../../source/platformAndroid/AndroidOutlineGL.cpp \ ../../../../../../source/platformAndroid/AndroidPlatform.cpp \ @@ -608,18 +610,15 @@ LOCAL_SRC_FILES := ../../../../../../lib/ljpeg/jcapimin.c \ ifeq ($(APP_OPTIM),debug) LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_DEBUG -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O0 -fsigned-char - LOCAL_CPPFLAGS := -std=gnu++11 $(LOCAL_CFLAGS) + LOCAL_CPPFLAGS := -std=gnu++11 -frtti $(LOCAL_CFLAGS) else LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O3 -fsigned-char - LOCAL_CPPFLAGS := -std=gnu++11 $(LOCAL_CFLAGS) + LOCAL_CPPFLAGS := -std=gnu++11 -frtti $(LOCAL_CFLAGS) endif LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM -lz -lOpenSLES -L../../../../../../lib/openal/Android/$(TARGET_ARCH_ABI) -LOCAL_STATIC_LIBRARIES := android_native_app_glue freetype-prebuilt +LOCAL_STATIC_LIBRARIES := freetype-prebuilt LOCAL_SHARED_LIBRARIES := libopenal-prebuilt LOCAL_ARM_MODE := arm include $(BUILD_SHARED_LIBRARY) - -$(call import-module,android/native_app_glue) - diff --git a/engine/compilers/android-studio/app/src/main/jni/Application.mk b/engine/compilers/android-studio/app/src/main/jni/Application.mk index a7d057e9d..72a6ecc4d 100644 --- a/engine/compilers/android-studio/app/src/main/jni/Application.mk +++ b/engine/compilers/android-studio/app/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_PLATFORM := android-10 -APP_STL := stlport_static +APP_PLATFORM := android-16 +APP_STL := c++_static APP_OPTIM := release -APP_ABI := armeabi-v7a +APP_ABI := armeabi-v7a x86 x86_64 diff --git a/engine/compilers/android-studio/build.gradle b/engine/compilers/android-studio/build.gradle index f4d8c542e..3cd97e819 100644 --- a/engine/compilers/android-studio/build.gradle +++ b/engine/compilers/android-studio/build.gradle @@ -2,9 +2,12 @@ buildscript { repositories { jcenter() + maven { + url "https://maven.google.com" + } } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:3.0.1' } } diff --git a/engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties b/engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties index 0c71e760d..91858003b 100644 --- a/engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties +++ b/engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sun Feb 04 22:37:25 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/engine/compilers/android-studio/import-summary.txt b/engine/compilers/android-studio/import-summary.txt deleted file mode 100644 index 377a2b0ad..000000000 --- a/engine/compilers/android-studio/import-summary.txt +++ /dev/null @@ -1,42 +0,0 @@ -ECLIPSE ANDROID PROJECT IMPORT SUMMARY -====================================== - -Ignored Files: --------------- -The following files were *not* copied into the new Gradle project; you -should evaluate whether these are still needed in your project and if -so manually move them: - -* .externalToolBuilders/ -* .externalToolBuilders/NDK Builder.launch -* NDKKeyboardBugFix/ -* NDKKeyboardBugFix/android_native_app_glue.c -* build.xml -* ic_launcher-web.png - -Moved Files: ------------- -Android Gradle projects use a different directory structure than ADT -Eclipse projects. Here's how the projects were restructured: - -* AndroidManifest.xml => app/src/main/AndroidManifest.xml -* assets/ => app/src/main/assets/ -* jni/ => app/src/main/jni/ -* lint.xml => app/lint.xml -* res/ => app/src/main/res/ -* src/ => app/src/main/java/ - -Next Steps: ------------ -You can now build the project. The Gradle project needs network -connectivity to download dependencies. - -Bugs: ------ -If for some reason your project does not build, and you determine that -it is due to a bug or limitation of the Eclipse to Gradle importer, -please file a bug at http://b.android.com with category -Component-Tools. - -(This import summary is for your information only, and can be deleted -after import once you are satisfied with the results.) diff --git a/engine/compilers/android/.classpath b/engine/compilers/android/.classpath deleted file mode 100644 index 51769745b..000000000 --- a/engine/compilers/android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/engine/compilers/android/.cproject b/engine/compilers/android/.cproject deleted file mode 100644 index 6a1f87884..000000000 --- a/engine/compilers/android/.cproject +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/compilers/android/.externalToolBuilders/NDK Builder.launch b/engine/compilers/android/.externalToolBuilders/NDK Builder.launch deleted file mode 100644 index 617265555..000000000 --- a/engine/compilers/android/.externalToolBuilders/NDK Builder.launch +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/engine/compilers/android/.project b/engine/compilers/android/.project deleted file mode 100644 index 9f107d6f9..000000000 --- a/engine/compilers/android/.project +++ /dev/null @@ -1,105 +0,0 @@ - - - Torque2D - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - ndk-build - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - jni/source - 2 - WORKSPACE_LOC/engine/source - - - jni/torqueLibs - 2 - WORKSPACE_LOC/engine/lib - - - diff --git a/engine/compilers/android/.settings/org.eclipse.cdt.codan.core.prefs b/engine/compilers/android/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index 448b445ed..000000000 --- a/engine/compilers/android/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,66 +0,0 @@ -eclipse.preferences.version=1 -inEditor=false -org.eclipse.cdt.codan.checkers.errnoreturn=Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={} -org.eclipse.cdt.codan.checkers.noreturn=Error -org.eclipse.cdt.codan.checkers.noreturn.params={implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Warning -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} diff --git a/engine/compilers/android/.settings/org.eclipse.jdt.core.prefs b/engine/compilers/android/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca..000000000 --- a/engine/compilers/android/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/engine/compilers/android/AndroidManifest.xml b/engine/compilers/android/AndroidManifest.xml deleted file mode 100644 index b30c7fc98..000000000 --- a/engine/compilers/android/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/compilers/android/assets/splash.png b/engine/compilers/android/assets/splash.png deleted file mode 100644 index 1ebafd26b..000000000 Binary files a/engine/compilers/android/assets/splash.png and /dev/null differ diff --git a/engine/compilers/android/build.xml b/engine/compilers/android/build.xml deleted file mode 100644 index 28e5f5b12..000000000 --- a/engine/compilers/android/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/engine/compilers/android/ic_launcher-web.png b/engine/compilers/android/ic_launcher-web.png deleted file mode 100644 index 2d2d22838..000000000 Binary files a/engine/compilers/android/ic_launcher-web.png and /dev/null differ diff --git a/engine/compilers/android/jni/Android.mk b/engine/compilers/android/jni/Android.mk deleted file mode 100644 index 3eec0095b..000000000 --- a/engine/compilers/android/jni/Android.mk +++ /dev/null @@ -1,589 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#required for compiling on windows -NDK_APP_SHORT_COMMANDS := true -LOCAL_SHORT_COMMANDS := true - -MY_LOCAL_PATH := $(call my-dir) - -LOCAL_PATH := $(MY_LOCAL_PATH) -# OpenAL Soft library must be a shared library since license is LGPLv3 -include $(CLEAR_VARS) - -LOCAL_MODULE := libopenal-prebuilt -LOCAL_SRC_FILES := ../../../lib/openal/Android/$(TARGET_ARCH_ABI)/libopenal.so -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../lib/openal/Android/openal-soft-master/jni/OpenAL/include - -include $(PREBUILT_SHARED_LIBRARY) - -#freetype2 lib for generating fonts on device -LOCAL_PATH := $(MY_LOCAL_PATH) - -include $(CLEAR_VARS) - -LOCAL_MODULE := freetype-prebuilt -LOCAL_SRC_FILES := ../../../lib/freetype/android/lib/libfreetype.a -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../lib/freetype/android/include $(LOCAL_PATH)/../../../lib/freetype/android/include/freetype2 - -include $(PREBUILT_STATIC_LIBRARY) - -LOCAL_PATH := $(MY_LOCAL_PATH) - -include $(CLEAR_VARS) - -LOCAL_MODULE := torque2d -LOCAL_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../../lib/ljpeg \ - $(LOCAL_PATH)/../../../lib/lpng \ - $(LOCAL_PATH)/../../../source \ - $(LOCAL_PATH)/../../../source/2d \ - $(LOCAL_PATH)/../../../source/2d/assets \ - $(LOCAL_PATH)/../../../source/2d/controllers \ - $(LOCAL_PATH)/../../../source/2d/core \ - $(LOCAL_PATH)/../../../source/2d/experimental/composites \ - $(LOCAL_PATH)/../../../source/2d/gui \ - $(LOCAL_PATH)/../../../source/2d/sceneobject \ - $(LOCAL_PATH)/../../../source/2d/scene \ - $(LOCAL_PATH)/../../../source/algorithm \ - $(LOCAL_PATH)/../../../source/assets \ - $(LOCAL_PATH)/../../../source/audio \ - $(LOCAL_PATH)/../../../source/Box2D \ - $(LOCAL_PATH)/../../../source/Box2D/Collision \ - $(LOCAL_PATH)/../../../source/Box2D/Collision/Shapes \ - $(LOCAL_PATH)/../../../source/Box2D/Common \ - $(LOCAL_PATH)/../../../source/Box2D/Dynamics \ - $(LOCAL_PATH)/../../../source/Box2D/Dynamics/Contacts \ - $(LOCAL_PATH)/../../../source/Box2D/Dynamics/Joints \ - $(LOCAL_PATH)/../../../source/Box2D/Rope \ - $(LOCAL_PATH)/../../../source/collection \ - $(LOCAL_PATH)/../../../source/component \ - $(LOCAL_PATH)/../../../source/component/behaviors \ - $(LOCAL_PATH)/../../../source/console \ - $(LOCAL_PATH)/../../../source/debug \ - $(LOCAL_PATH)/../../../source/debug/remote \ - $(LOCAL_PATH)/../../../source/delegates \ - $(LOCAL_PATH)/../../../source/game \ - $(LOCAL_PATH)/../../../source/graphics \ - $(LOCAL_PATH)/../../../source/gui \ - $(LOCAL_PATH)/../../../source/gui/buttons \ - $(LOCAL_PATH)/../../../source/gui/containers \ - $(LOCAL_PATH)/../../../source/gui/editor \ - $(LOCAL_PATH)/../../../source/gui/language \ - $(LOCAL_PATH)/../../../source/input \ - $(LOCAL_PATH)/../../../source/io \ - $(LOCAL_PATH)/../../../source/io/resource \ - $(LOCAL_PATH)/../../../source/io/zip \ - $(LOCAL_PATH)/../../../source/math \ - $(LOCAL_PATH)/../../../source/memory \ - $(LOCAL_PATH)/../../../source/messaging \ - $(LOCAL_PATH)/../../../source/module \ - $(LOCAL_PATH)/../../../source/network \ - $(LOCAL_PATH)/../../../source/persistence \ - $(LOCAL_PATH)/../../../source/persistence/taml \ - $(LOCAL_PATH)/../../../source/persistence/taml/binary \ - $(LOCAL_PATH)/../../../source/persistence/taml/json \ - $(LOCAL_PATH)/../../../source/persistence/taml/xml \ - $(LOCAL_PATH)/../../../source/persistence/rapidjson/include \ - $(LOCAL_PATH)/../../../source/platform \ - $(LOCAL_PATH)/../../../source/platform/nativeDialogs \ - $(LOCAL_PATH)/../../../source/platformAndroid \ - $(LOCAL_PATH)/../../../source/sim \ - $(LOCAL_PATH)/../../../source/spine \ - $(LOCAL_PATH)/../../../source/string -# $(LOCAL_PATH)/../../../source/testing \ -# $(LOCAL_PATH)/../../../source/testing/tests \ - - -LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \ - ../../../lib/ljpeg/jcapistd.c \ - ../../../lib/ljpeg/jccoefct.c \ - ../../../lib/ljpeg/jccolor.c \ - ../../../lib/ljpeg/jcdctmgr.c \ - ../../../lib/ljpeg/jchuff.c \ - ../../../lib/ljpeg/jcinit.c \ - ../../../lib/ljpeg/jcmainct.c \ - ../../../lib/ljpeg/jcmarker.c \ - ../../../lib/ljpeg/jcmaster.c \ - ../../../lib/ljpeg/jcomapi.c \ - ../../../lib/ljpeg/jcparam.c \ - ../../../lib/ljpeg/jcphuff.c \ - ../../../lib/ljpeg/jcprepct.c \ - ../../../lib/ljpeg/jcsample.c \ - ../../../lib/ljpeg/jctrans.c \ - ../../../lib/ljpeg/jdapimin.c \ - ../../../lib/ljpeg/jdapistd.c \ - ../../../lib/ljpeg/jdatadst.c \ - ../../../lib/ljpeg/jdatasrc.c \ - ../../../lib/ljpeg/jdcoefct.c \ - ../../../lib/ljpeg/jdcolor.c \ - ../../../lib/ljpeg/jddctmgr.c \ - ../../../lib/ljpeg/jdhuff.c \ - ../../../lib/ljpeg/jdinput.c \ - ../../../lib/ljpeg/jdmainct.c \ - ../../../lib/ljpeg/jdmarker.c \ - ../../../lib/ljpeg/jdmaster.c \ - ../../../lib/ljpeg/jdmerge.c \ - ../../../lib/ljpeg/jdphuff.c \ - ../../../lib/ljpeg/jdpostct.c \ - ../../../lib/ljpeg/jdsample.c \ - ../../../lib/ljpeg/jdtrans.c \ - ../../../lib/ljpeg/jerror.c \ - ../../../lib/ljpeg/jfdctflt.c \ - ../../../lib/ljpeg/jfdctfst.c \ - ../../../lib/ljpeg/jfdctint.c \ - ../../../lib/ljpeg/jidctflt.c \ - ../../../lib/ljpeg/jidctfst.c \ - ../../../lib/ljpeg/jidctint.c \ - ../../../lib/ljpeg/jidctred.c \ - ../../../lib/ljpeg/jmemansi.c \ - ../../../lib/ljpeg/jmemmgr.c \ - ../../../lib/ljpeg/jquant1.c \ - ../../../lib/ljpeg/jquant2.c \ - ../../../lib/ljpeg/jutils.c \ - ../../../lib/lpng/png.c \ - ../../../lib/lpng/pngerror.c \ - ../../../lib/lpng/pngget.c \ - ../../../lib/lpng/pngmem.c \ - ../../../lib/lpng/pngpread.c \ - ../../../lib/lpng/pngread.c \ - ../../../lib/lpng/pngrio.c \ - ../../../lib/lpng/pngrtran.c \ - ../../../lib/lpng/pngrutil.c \ - ../../../lib/lpng/pngset.c \ - ../../../lib/lpng/pngtrans.c \ - ../../../lib/lpng/pngwio.c \ - ../../../lib/lpng/pngwrite.c \ - ../../../lib/lpng/pngwtran.c \ - ../../../lib/lpng/pngwutil.c \ - ../../../source/2d/assets/AnimationAsset.cc \ - ../../../source/2d/assets/ImageAsset.cc \ - ../../../source/2d/assets/ParticleAsset.cc \ - ../../../source/2d/assets/ParticleAssetEmitter.cc \ - ../../../source/2d/assets/ParticleAssetField.cc \ - ../../../source/2d/assets/ParticleAssetFieldCollection.cc \ - ../../../source/2d/assets/SkeletonAsset.cc \ - ../../../source/2d/controllers/AmbientForceController.cc \ - ../../../source/2d/controllers/BuoyancyController.cc \ - ../../../source/2d/controllers/core/GroupedSceneController.cc \ - ../../../source/2d/controllers/core/PickingSceneController.cc \ - ../../../source/2d/controllers/PointForceController.cc \ - ../../../source/2d/core/BatchRender.cc \ - ../../../source/2d/core/CoreMath.cc \ - ../../../source/2d/core/ImageFrameProvider.cc \ - ../../../source/2d/core/ImageFrameProviderCore.cc \ - ../../../source/2d/core/ParticleSystem.cc \ - ../../../source/2d/core/RenderProxy.cc \ - ../../../source/2d/core/SpriteBase.cc \ - ../../../source/2d/core/SpriteBatch.cc \ - ../../../source/2d/core/SpriteBatchItem.cc \ - ../../../source/2d/core/SpriteBatchQuery.cc \ - ../../../source/2d/core/Utility.cc \ - ../../../source/2d/core/Vector2.cc \ - ../../../source/2d/experimental/composites/WaveComposite.cc \ - ../../../source/2d/gui/guiImageButtonCtrl.cc \ - ../../../source/2d/gui/guiSceneObjectCtrl.cc \ - ../../../source/2d/gui/guiSpriteCtrl.cc \ - ../../../source/2d/gui/SceneWindow.cc \ - ../../../source/2d/sceneobject/CompositeSprite.cc \ - ../../../source/2d/sceneobject/ImageFont.cc \ - ../../../source/2d/sceneobject/ParticlePlayer.cc \ - ../../../source/2d/sceneobject/SceneObject.cc \ - ../../../source/2d/sceneobject/SceneObjectList.cc \ - ../../../source/2d/sceneobject/SceneObjectSet.cc \ - ../../../source/2d/sceneobject/Scroller.cc \ - ../../../source/2d/sceneobject/ShapeVector.cc \ - ../../../source/2d/sceneobject/SkeletonObject.cc \ - ../../../source/2d/sceneobject/Sprite.cc \ - ../../../source/2d/sceneobject/Trigger.cc \ - ../../../source/2d/scene/ContactFilter.cc \ - ../../../source/2d/scene/DebugDraw.cc \ - ../../../source/2d/scene/Scene.cc \ - ../../../source/2d/scene/SceneRenderFactories.cpp \ - ../../../source/2d/scene/SceneRenderQueue.cpp \ - ../../../source/2d/scene/WorldQuery.cc \ - ../../../source/algorithm/crc.cc \ - ../../../source/algorithm/hashFunction.cc \ - ../../../source/assets/assetBase.cc \ - ../../../source/assets/assetFieldTypes.cc \ - ../../../source/assets/assetManager.cc \ - ../../../source/assets/assetQuery.cc \ - ../../../source/assets/assetTagsManifest.cc \ - ../../../source/assets/declaredAssets.cc \ - ../../../source/assets/referencedAssets.cc \ - ../../../source/audio/AudioAsset.cc \ - ../../../source/Box2D/Collision/b2BroadPhase.cpp \ - ../../../source/Box2D/Collision/b2CollideCircle.cpp \ - ../../../source/Box2D/Collision/b2CollideEdge.cpp \ - ../../../source/Box2D/Collision/b2CollidePolygon.cpp \ - ../../../source/Box2D/Collision/b2Collision.cpp \ - ../../../source/Box2D/Collision/b2Distance.cpp \ - ../../../source/Box2D/Collision/b2DynamicTree.cpp \ - ../../../source/Box2D/Collision/b2TimeOfImpact.cpp \ - ../../../source/Box2D/Collision/Shapes/b2ChainShape.cpp \ - ../../../source/Box2D/Collision/Shapes/b2CircleShape.cpp \ - ../../../source/Box2D/Collision/Shapes/b2EdgeShape.cpp \ - ../../../source/Box2D/Collision/Shapes/b2PolygonShape.cpp \ - ../../../source/Box2D/Common/b2BlockAllocator.cpp \ - ../../../source/Box2D/Common/b2Draw.cpp \ - ../../../source/Box2D/Common/b2Math.cpp \ - ../../../source/Box2D/Common/b2Settings.cpp \ - ../../../source/Box2D/Common/b2StackAllocator.cpp \ - ../../../source/Box2D/Common/b2Timer.cpp \ - ../../../source/Box2D/Dynamics/b2Body.cpp \ - ../../../source/Box2D/Dynamics/b2ContactManager.cpp \ - ../../../source/Box2D/Dynamics/b2Fixture.cpp \ - ../../../source/Box2D/Dynamics/b2Island.cpp \ - ../../../source/Box2D/Dynamics/b2World.cpp \ - ../../../source/Box2D/Dynamics/b2WorldCallbacks.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2CircleContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2Contact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2ContactSolver.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp \ - ../../../source/Box2D/Dynamics/Contacts/b2PolygonContact.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2DistanceJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2FrictionJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2GearJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2Joint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2MotorJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2MouseJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2PulleyJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2RopeJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2WeldJoint.cpp \ - ../../../source/Box2D/Dynamics/Joints/b2WheelJoint.cpp \ - ../../../source/Box2D/Rope/b2Rope.cpp \ - ../../../source/collection/bitTables.cc \ - ../../../source/collection/hashTable.cc \ - ../../../source/collection/nameTags.cpp \ - ../../../source/collection/undo.cc \ - ../../../source/collection/vector.cc \ - ../../../source/console/consoleBaseType.cc \ - ../../../source/console/consoleDictionary.cc \ - ../../../source/console/consoleExprEvalState.cc \ - ../../../source/console/consoleNamespace.cc \ - ../../../source/console/ConsoleTypeValidators.cc \ - ../../../source/console/metaScripting_ScriptBinding.cc \ - ../../../source/debug/profiler.cc \ - ../../../source/debug/remote/RemoteDebugger1.cc \ - ../../../source/debug/remote/RemoteDebuggerBase.cc \ - ../../../source/debug/remote/RemoteDebuggerBridge.cc \ - ../../../source/debug/telnetDebugger.cc \ - ../../../source/delegates/delegateSignal.cpp \ - ../../../source/game/defaultGame.cc \ - ../../../source/game/gameInterface.cc \ - ../../../source/graphics/bitmapBmp.cc \ - ../../../source/graphics/bitmapJpeg.cc \ - ../../../source/graphics/bitmapPng.cc \ - ../../../source/graphics/color.cc \ - ../../../source/graphics/dgl.cc \ - ../../../source/graphics/dglMatrix.cc \ - ../../../source/graphics/DynamicTexture.cc \ - ../../../source/graphics/gBitmap.cc \ - ../../../source/graphics/gFont.cc \ - ../../../source/graphics/gPalette.cc \ - ../../../source/graphics/PNGImage.cpp \ - ../../../source/graphics/splineUtil.cc \ - ../../../source/graphics/TextureDictionary.cc \ - ../../../source/graphics/TextureHandle.cc \ - ../../../source/graphics/TextureManager.cc \ - ../../../source/gui/containers/guiGridCtrl.cc \ - ../../../source/gui/guiArrayCtrl.cc \ - ../../../source/gui/guiBackgroundCtrl.cc \ - ../../../source/gui/guiBitmapBorderCtrl.cc \ - ../../../source/gui/guiBitmapCtrl.cc \ - ../../../source/gui/guiBubbleTextCtrl.cc \ - ../../../source/gui/guiCanvas.cc \ - ../../../source/gui/guiColorPicker.cc \ - ../../../source/gui/guiConsole.cc \ - ../../../source/gui/guiConsoleEditCtrl.cc \ - ../../../source/gui/guiConsoleTextCtrl.cc \ - ../../../source/gui/guiControl.cc \ - ../../../source/gui/guiDefaultControlRender.cc \ - ../../../source/gui/guiFadeinBitmapCtrl.cc \ - ../../../source/gui/guiInputCtrl.cc \ - ../../../source/gui/guiListBoxCtrl.cc \ - ../../../source/gui/guiMessageVectorCtrl.cc \ - ../../../source/gui/guiMLTextCtrl.cc \ - ../../../source/gui/guiMLTextEditCtrl.cc \ - ../../../source/gui/guiMouseEventCtrl.cc \ - ../../../source/gui/guiPopUpCtrl.cc \ - ../../../source/gui/guiPopUpCtrlEx.cc \ - ../../../source/gui/guiProgressCtrl.cc \ - ../../../source/gui/guiScriptNotifyControl.cc \ - ../../../source/gui/guiSliderCtrl.cc \ - ../../../source/gui/guiTabPageCtrl.cc \ - ../../../source/gui/guiTextCtrl.cc \ - ../../../source/gui/guiTextEditCtrl.cc \ - ../../../source/gui/guiTextEditSliderCtrl.cc \ - ../../../source/gui/guiTextListCtrl.cc \ - ../../../source/gui/guiTickCtrl.cc \ - ../../../source/gui/guiTreeViewCtrl.cc \ - ../../../source/gui/guiTypes.cc \ - ../../../source/gui/language/lang.cc \ - ../../../source/gui/messageVector.cc \ - ../../../source/input/actionMap.cc \ - ../../../source/io/bitStream.cc \ - ../../../source/io/bufferStream.cc \ - ../../../source/io/fileObject.cc \ - ../../../source/io/fileStream.cc \ - ../../../source/io/fileStreamObject.cc \ - ../../../source/io/fileSystem_ScriptBinding.cc \ - ../../../source/io/filterStream.cc \ - ../../../source/io/memStream.cc \ - ../../../source/io/nStream.cc \ - ../../../source/io/resizeStream.cc \ - ../../../source/io/resource/resourceDictionary.cc \ - ../../../source/io/resource/resourceManager.cc \ - ../../../source/io/streamObject.cc \ - ../../../source/io/zip/centralDir.cc \ - ../../../source/io/zip/compressor.cc \ - ../../../source/io/zip/deflate.cc \ - ../../../source/io/zip/extraField.cc \ - ../../../source/io/zip/fileHeader.cc \ - ../../../source/io/zip/stored.cc \ - ../../../source/io/zip/zipArchive.cc \ - ../../../source/io/zip/zipCryptStream.cc \ - ../../../source/io/zip/zipObject.cc \ - ../../../source/io/zip/zipSubStream.cc \ - ../../../source/io/zip/zipTempStream.cc \ - ../../../source/math/rectClipper.cpp \ - ../../../source/memory/dataChunker.cc \ - ../../../source/memory/frameAllocator_ScriptBinding.cc \ - ../../../source/messaging/dispatcher.cc \ - ../../../source/messaging/eventManager.cc \ - ../../../source/messaging/message.cc \ - ../../../source/messaging/messageForwarder.cc \ - ../../../source/messaging/scriptMsgListener.cc \ - ../../../source/module/moduleDefinition.cc \ - ../../../source/module/moduleManager.cc \ - ../../../source/module/moduleMergeDefinition.cc \ - ../../../source/network/connectionProtocol.cc \ - ../../../source/network/connectionStringTable.cc \ - ../../../source/network/httpObject.cc \ - ../../../source/network/netConnection.cc \ - ../../../source/network/netDownload.cc \ - ../../../source/network/netEvent.cc \ - ../../../source/network/netGhost.cc \ - ../../../source/network/netInterface.cc \ - ../../../source/network/netObject.cc \ - ../../../source/network/netStringTable.cc \ - ../../../source/network/netTest.cc \ - ../../../source/network/networkProcessList.cc \ - ../../../source/network/RemoteCommandEvent.cc \ - ../../../source/network/serverQuery.cc \ - ../../../source/network/tcpObject.cc \ - ../../../source/network/telnetConsole.cc \ - ../../../source/persistence/taml/binary/tamlBinaryReader.cc \ - ../../../source/persistence/taml/binary/tamlBinaryWriter.cc \ - ../../../source/persistence/taml/json/tamlJSONParser.cc \ - ../../../source/persistence/taml/json/tamlJSONReader.cc \ - ../../../source/persistence/taml/json/tamlJSONWriter.cc \ - ../../../source/persistence/taml/taml.cc \ - ../../../source/persistence/taml/tamlCustom.cc \ - ../../../source/persistence/taml/tamlWriteNode.cc \ - ../../../source/persistence/taml/xml/tamlXmlParser.cc \ - ../../../source/persistence/taml/xml/tamlXmlReader.cc \ - ../../../source/persistence/taml/xml/tamlXmlWriter.cc \ - ../../../source/persistence/tinyXML/tinystr.cpp \ - ../../../source/persistence/tinyXML/tinyxml.cpp \ - ../../../source/persistence/tinyXML/tinyxmlerror.cpp \ - ../../../source/persistence/tinyXML/tinyxmlparser.cpp \ - ../../../source/audio/audio.cc \ - ../../../source/audio/audioBuffer.cc \ - ../../../source/audio/audioDataBlock.cc \ - ../../../source/audio/audio_ScriptBinding.cc \ - ../../../source/audio/audioStreamSourceFactory.cc \ - ../../../source/audio/wavStreamSource.cc \ - ../../../source/component/dynamicConsoleMethodComponent.cpp \ - ../../../source/component/simComponent.cpp \ - ../../../source/component/behaviors/behaviorComponent.cpp \ - ../../../source/component/behaviors/behaviorInstance.cpp \ - ../../../source/component/behaviors/behaviorTemplate.cpp \ - ../../../source/console/astAlloc.cc \ - ../../../source/console/astNodes.cc \ - ../../../source/console/cmdgram.cc \ - ../../../source/console/CMDscan.cc \ - ../../../source/console/codeBlock.cc \ - ../../../source/console/compiledEval.cc \ - ../../../source/console/compiler.cc \ - ../../../source/console/console.cc \ - ../../../source/console/consoleDoc.cc \ - ../../../source/console/consoleFunctions.cc \ - ../../../source/console/consoleLogger.cc \ - ../../../source/console/consoleObject.cc \ - ../../../source/console/consoleParser.cc \ - ../../../source/console/consoleTypes.cc \ - ../../../source/game/gameConnection.cc \ - ../../../source/game/version.cc \ - ../../../source/math/math_ScriptBinding.cc \ - ../../../source/math/mathTypes.cc \ - ../../../source/math/mathUtils.cc \ - ../../../source/math/mBox.cc \ - ../../../source/math/mMath_C.cc \ - ../../../source/math/mMathAltivec.cc \ - ../../../source/math/mMathAMD.cc \ - ../../../source/math/mMathFn.cc \ - ../../../source/math/mMathSSE.cc \ - ../../../source/math/mMatrix.cc \ - ../../../source/math/mPlaneTransformer.cc \ - ../../../source/math/mQuadPatch.cc \ - ../../../source/math/mQuat.cc \ - ../../../source/math/mRandom.cc \ - ../../../source/math/mSolver.cc \ - ../../../source/math/mSplinePatch.cc \ - ../../../source/math/mPoint.cpp \ - ../../../source/persistence/SimXMLDocument.cpp \ - ../../../source/platform/CursorManager.cc \ - ../../../source/platform/nativeDialogs/fileDialog.cc \ - ../../../source/platform/platform.cc \ - ../../../source/platform/platformAssert.cc \ - ../../../source/platform/platformCPU.cc \ - ../../../source/platform/platformFileIO.cc \ - ../../../source/platform/platformFont.cc \ - ../../../source/platform/platformMemory.cc \ - ../../../source/platform/platformNetwork_ScriptBinding.cc \ - ../../../source/platform/platformString.cc \ - ../../../source/platform/platformVideo.cc \ - ../../../source/platform/platformNetAsync.unix.cc \ - ../../../source/platform/menus/popupMenu.cc \ - ../../../source/platform/nativeDialogs/msgBox.cpp \ - ../../../source/platform/Tickable.cc \ - ../../../source/platformAndroid/AndroidAlerts.cpp \ - ../../../source/platformAndroid/AndroidAudio.cpp \ - ../../../source/platformAndroid/AndroidConsole.cpp \ - ../../../source/platformAndroid/AndroidCPUInfo.cpp \ - ../../../source/platformAndroid/AndroidDialogs.cpp \ - ../../../source/platformAndroid/AndroidEvents.cpp \ - ../../../source/platformAndroid/AndroidFileio.cpp \ - ../../../source/platformAndroid/AndroidFont.cpp \ - ../../../source/platformAndroid/AndroidGL.cpp \ - ../../../source/platformAndroid/AndroidGL2ES.cpp \ - ../../../source/platformAndroid/AndroidInput.cpp \ - ../../../source/platformAndroid/AndroidMath.cpp \ - ../../../source/platformAndroid/AndroidMemory.cpp \ - ../../../source/platformAndroid/AndroidMutex.cpp \ - ../../../source/platformAndroid/AndroidNet.cpp \ - ../../../source/platformAndroid/AndroidOGLVideo.cpp \ - ../../../source/platformAndroid/AndroidOutlineGL.cpp \ - ../../../source/platformAndroid/AndroidPlatform.cpp \ - ../../../source/platformAndroid/AndroidProcessControl.cpp \ - ../../../source/platformAndroid/AndroidProfiler.cpp \ - ../../../source/platformAndroid/AndroidSemaphore.cpp \ - ../../../source/platformAndroid/AndroidStreamSource.cc \ - ../../../source/platformAndroid/AndroidStrings.cpp \ - ../../../source/platformAndroid/AndroidThread.cpp \ - ../../../source/platformAndroid/AndroidTime.cpp \ - ../../../source/platformAndroid/AndroidUtil.cpp \ - ../../../source/platformAndroid/AndroidWindow.cpp \ - ../../../source/platformAndroid/main.cpp \ - ../../../source/platformAndroid/T2DActivity.cpp \ - ../../../source/platformAndroid/menus/popupMenu.cpp \ - ../../../source/sim/scriptGroup.cc \ - ../../../source/sim/scriptObject.cc \ - ../../../source/sim/simBase.cc \ - ../../../source/sim/simConsoleEvent.cc \ - ../../../source/sim/simConsoleThreadExecEvent.cc \ - ../../../source/sim/simDatablock.cc \ - ../../../source/sim/simDictionary.cc \ - ../../../source/sim/simFieldDictionary.cc \ - ../../../source/sim/simManager.cc \ - ../../../source/sim/simObject.cc \ - ../../../source/sim/SimObjectList.cc \ - ../../../source/sim/simSerialize.cpp \ - ../../../source/sim/simSet.cc \ - ../../../source/spine/Animation.c \ - ../../../source/spine/AnimationState.c \ - ../../../source/spine/AnimationStateData.c \ - ../../../source/spine/Atlas.c \ - ../../../source/spine/AtlasAttachmentLoader.c \ - ../../../source/spine/Attachment.c \ - ../../../source/spine/AttachmentLoader.c \ - ../../../source/spine/Bone.c \ - ../../../source/spine/BoneData.c \ - ../../../source/spine/BoundingBoxAttachment.c \ - ../../../source/spine/Event.c \ - ../../../source/spine/EventData.c \ - ../../../source/spine/extension.c \ - ../../../source/spine/Json.c \ - ../../../source/spine/RegionAttachment.c \ - ../../../source/spine/Skeleton.c \ - ../../../source/spine/SkeletonBounds.c \ - ../../../source/spine/SkeletonData.c \ - ../../../source/spine/SkeletonJson.c \ - ../../../source/spine/Skin.c \ - ../../../source/spine/Slot.c \ - ../../../source/spine/SlotData.c \ - ../../../source/string/findMatch.cc \ - ../../../source/string/stringBuffer.cc \ - ../../../source/string/stringStack.cc \ - ../../../source/string/stringTable.cc \ - ../../../source/string/stringUnit.cpp \ - ../../../source/string/unicode.cc \ - ../../../source/gui/buttons/guiBitmapButtonCtrl.cc \ - ../../../source/gui/buttons/guiBorderButton.cc \ - ../../../source/gui/buttons/guiButtonBaseCtrl.cc \ - ../../../source/gui/buttons/guiButtonCtrl.cc \ - ../../../source/gui/buttons/guiCheckBoxCtrl.cc \ - ../../../source/gui/buttons/guiIconButtonCtrl.cc \ - ../../../source/gui/buttons/guiRadioCtrl.cc \ - ../../../source/gui/buttons/guiToolboxButtonCtrl.cc \ - ../../../source/gui/containers/guiAutoScrollCtrl.cc \ - ../../../source/gui/containers/guiCtrlArrayCtrl.cc \ - ../../../source/gui/containers/guiDragAndDropCtrl.cc \ - ../../../source/gui/containers/guiDynamicCtrlArrayCtrl.cc \ - ../../../source/gui/containers/guiFormCtrl.cc \ - ../../../source/gui/containers/guiFrameCtrl.cc \ - ../../../source/gui/containers/guiPaneCtrl.cc \ - ../../../source/gui/containers/guiRolloutCtrl.cc \ - ../../../source/gui/containers/guiScrollCtrl.cc \ - ../../../source/gui/containers/guiStackCtrl.cc \ - ../../../source/gui/containers/guiTabBookCtrl.cc \ - ../../../source/gui/containers/guiWindowCtrl.cc \ - ../../../source/gui/editor/guiControlListPopup.cc \ - ../../../source/gui/editor/guiDebugger.cc \ - ../../../source/gui/editor/guiEditCtrl.cc \ - ../../../source/gui/editor/guiFilterCtrl.cc \ - ../../../source/gui/editor/guiGraphCtrl.cc \ - ../../../source/gui/editor/guiImageList.cc \ - ../../../source/gui/editor/guiInspector.cc \ - ../../../source/gui/editor/guiInspectorTypes.cc \ - ../../../source/gui/editor/guiMenuBar.cc \ - ../../../source/gui/editor/guiSeparatorCtrl.cc -# ../../../source/testing/tests/platformFileIoTests.cc \ -# ../../../source/testing/tests/platformMemoryTests.cc \ -# ../../../source/testing/tests/platformStringTests.cc \ -# ../../../source/testing/unitTesting.cc - -ifeq ($(APP_OPTIM),debug) - LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_DEBUG -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O0 -fsigned-char -else - LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O3 -fsigned-char -endif -LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM -lz -lOpenSLES -L../../../lib/openal/Android/$(TARGET_ARCH_ABI) -LOCAL_STATIC_LIBRARIES := android_native_app_glue freetype-prebuilt -LOCAL_SHARED_LIBRARIES := libopenal-prebuilt - -LOCAL_ARM_MODE := arm - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,android/native_app_glue) - diff --git a/engine/compilers/android/jni/Application.mk b/engine/compilers/android/jni/Application.mk deleted file mode 100644 index a7d057e9d..000000000 --- a/engine/compilers/android/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -APP_PLATFORM := android-10 -APP_STL := stlport_static -APP_OPTIM := release -APP_ABI := armeabi-v7a diff --git a/engine/compilers/android/lint.xml b/engine/compilers/android/lint.xml deleted file mode 100644 index ee0eead5b..000000000 --- a/engine/compilers/android/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/engine/compilers/android/project.properties b/engine/compilers/android/project.properties deleted file mode 100644 index a2bff5858..000000000 --- a/engine/compilers/android/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-18 -android.library=false diff --git a/engine/compilers/android/res/drawable-hdpi/ic_launcher.png b/engine/compilers/android/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 0a0cfcc05..000000000 Binary files a/engine/compilers/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/engine/compilers/android/res/drawable-ldpi/ic_launcher.png b/engine/compilers/android/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 0a0cfcc05..000000000 Binary files a/engine/compilers/android/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/engine/compilers/android/res/drawable-mdpi/ic_launcher.png b/engine/compilers/android/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 0a0cfcc05..000000000 Binary files a/engine/compilers/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/engine/compilers/android/res/drawable-xhdpi/ic_launcher.png b/engine/compilers/android/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 0a0cfcc05..000000000 Binary files a/engine/compilers/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/engine/compilers/android/res/menu/activity_main.xml b/engine/compilers/android/res/menu/activity_main.xml deleted file mode 100644 index 6cef307e8..000000000 --- a/engine/compilers/android/res/menu/activity_main.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/engine/compilers/android/res/values-v11/styles.xml b/engine/compilers/android/res/values-v11/styles.xml deleted file mode 100644 index 30a6d0362..000000000 --- a/engine/compilers/android/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/engine/compilers/android/res/values-v14/styles.xml b/engine/compilers/android/res/values-v14/styles.xml deleted file mode 100644 index c57a2d8d0..000000000 --- a/engine/compilers/android/res/values-v14/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/engine/compilers/android/res/values/strings.xml b/engine/compilers/android/res/values/strings.xml deleted file mode 100644 index 332b98cbe..000000000 --- a/engine/compilers/android/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Torque2D - - \ No newline at end of file diff --git a/engine/compilers/android/res/values/styles.xml b/engine/compilers/android/res/values/styles.xml deleted file mode 100644 index d4984e93a..000000000 --- a/engine/compilers/android/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/engine/compilers/android/src/com/garagegames/torque2d/FileWalker.java b/engine/compilers/android/src/com/garagegames/torque2d/FileWalker.java deleted file mode 100644 index 4edd53541..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/FileWalker.java +++ /dev/null @@ -1,339 +0,0 @@ -package com.garagegames.torque2d; - -import java.io.IOException; -import java.util.Hashtable; -import java.util.Vector; - -import android.content.Context; -import android.content.Intent; -import android.content.res.AssetFileDescriptor; -import android.content.res.AssetManager; -import android.net.Uri; -import android.util.Log; - -public class FileWalker -{ - public static Hashtable> directories = new Hashtable>(); - public static Hashtable> files = new Hashtable>(); - public static Vector dumpPathVec = new Vector(); - public static Vector dumpDirVec = new Vector(); - public static Vector dumpDirList = new Vector(); - - public static void InitDirList(Context context, String dir) - { - AssetManager assetMgr = context.getAssets(); - try { - String[] assets = assetMgr.list(dir); - if (directories.containsKey(dir)) - directories.remove(dir); - directories.put(dir, new Vector()); - if (files.containsKey(dir)) - files.remove(dir); - files.put(dir, new Vector()); - - for(String asset: assets) { - if (asset.indexOf('.') == -1) - { - directories.get(dir).add(asset); - } - else - { - files.get(dir).add(asset); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static String[] DumpDirectories(Context context, String basePath, String path, boolean depth, boolean noBasePath) - { - double time = System.currentTimeMillis(); - dumpPathVec.clear(); - dumpDirVec.clear(); - - String dirPath = basePath; - - //remove any ./ from path since the apk code chokes on it - while (dirPath.contains("./")) - dirPath = dirPath.replace("./", ""); - - //remove any ../ from path since the apk code chokes on it - String search = "/../"; - while (dirPath.contains(search)) - { - int pos = dirPath.indexOf(search); - int posStart = dirPath.lastIndexOf("/", pos-1); - dirPath = dirPath.substring(0, posStart+1) + dirPath.substring(pos+4); - } - - if (dirPath.startsWith("/")) - dirPath = dirPath.substring(1); - - if (dirPath.endsWith("/")) - dirPath = dirPath.substring(0,dirPath.length()-1); - - if ( !noBasePath ) - dumpPathVec.add(dirPath); - - if (!path.equals("")) - { - dirPath = basePath + "/" + path; - - if (dirPath.endsWith("/")) - dirPath = dirPath.substring(0,dirPath.length()-1); - - } - DumpDir2(context, dirPath); - - while (depth && dumpDirVec.size() > 0) - { - String newdir = dumpDirVec.remove(0); - DumpDir2(context,newdir); - } - - int size = dumpPathVec.size(); - if (size > 500) - size = 500; - String[] retStringArray = new String[size]; - int cnt = 0; - for(cnt = 0; cnt < size; cnt++) - { - String s = dumpPathVec.remove(0); - if (noBasePath) - s = s.replace(basePath + "/", ""); - retStringArray[cnt] = "/" + s; - } - Log.i("torque2d", "time in dir java: " + (System.currentTimeMillis() - time) ); - - return retStringArray; - } - - public static void DumpDir2(Context context, String dir) - { - for (String d : dumpDirList) - { - String d2 = d.substring(1); - if (d2.equals(dir)) - continue; - - if (d2.length() < dir.length()) - continue; - - String newdir = ""; - if (dir.equals("")) - { - if (!d2.contains("/")) - { - dumpPathVec.add(d2); - newdir = d2; - } - } - else - { - if (d2.startsWith(dir)) - { - String asset = d2.replace(dir, "").substring(1); - if (!asset.contains("/")) - { - dumpPathVec.add(d2); - newdir = d2; - } - } - } - - - if (!newdir.equals("")) { - dumpDirVec.add(newdir); - } - } - } - - public static String[] DumpPath(Context context, String dirPath, boolean depth) - { - double time = System.currentTimeMillis(); - dumpPathVec.clear(); - dumpDirVec.clear(); - dumpDirList.clear(); - - String dir = dirPath; - - //remove any ./ from path since the apk code chokes on it - while (dir.contains("./")) - dir = dir.replace("./", ""); - - //remove any ../ from path since the apk code chokes on it - String search = "/../"; - while (dir.contains(search)) - { - int pos = dir.indexOf(search); - int posStart = dir.lastIndexOf("/", pos-1); - dir = dir.substring(0, posStart+1) + dir.substring(pos+4); - } - - if (dir.startsWith("/")) - dir = dir.substring(1); - - if (dir.endsWith("/")) - dir = dir.substring(0,dir.length()-1); - - //Log.i("torque2d","path start: " + dir); - DumpDir(context, dir); - - while (depth && dumpDirVec.size() > 0) - { - String newdir = dumpDirVec.remove(0); - //Log.i("torque2d","newpath " + newdir); - DumpDir(context,newdir); - } - - int size = dumpPathVec.size(); - if (size > 500) - size = 500; - //Log.i("torque2d","size " + size); - String[] retStringArray = new String[size]; - int cnt = 0; - for(cnt = 0; cnt < size; cnt++) - { - String s = dumpPathVec.remove(0); - //Log.i("torque2d","file " + s); - retStringArray[cnt] = "/" + s; - } - Log.i("torque2d", "time in java: " + (System.currentTimeMillis() - time) ); - return retStringArray; - } - - public static String[] getRestOfDump() - { - int size = dumpPathVec.size(); - if (size > 500) - size = 500; - String[] retStringArray = new String[size]; - int cnt = 0; - for(cnt = 0; cnt < size; cnt++) - { - String s = dumpPathVec.remove(0); - retStringArray[cnt] = "/" + s; - } - return retStringArray; - } - - public static void DumpDir(Context context, String dir) - { - AssetManager assetMgr = context.getAssets(); - try { - String[] assets = assetMgr.list(dir); - for (String asset : assets) - { - if (asset.equals(".") || asset.equals("..")) - continue; - - if (dir.equals("")) - { - if (asset.equals("images") || asset.equals("webkit") || asset.equals("sounds") || asset.equals("kioskmode")) - continue; - } - - if (asset.contains(".")) - { - if (dir.equals("")) - dumpPathVec.add(asset); - else - dumpPathVec.add(dir + "/" + asset); - } - else - { - String newdir = asset; - if (!dir.equals("")) - newdir = dir + "/" + asset; - - dumpDirVec.add(newdir); - if (newdir.startsWith("/")) - dumpDirList.add(newdir); - else - dumpDirList.add("/" + newdir); - - } - } - - } catch (IOException e) { - - } - } - - public static String GetNextDir(String dir) - { - if (directories.get(dir).size() == 0) - return null; - - return directories.get(dir).remove(0); - - } - - public static String GetNextFile(String dir) - { - if (files.get(dir).size() == 0) - return null; - - return files.get(dir).remove(0); - } - - public static boolean IsDir(Context context, String dir) - { - AssetManager assetMgr = context.getAssets(); - String[] assets; - try { - assets = assetMgr.list(dir); - if (assets != null && assets.length > 0) - { - return true; - } - - return false; - } catch (IOException e) { - e.printStackTrace(); - return false; - } - } - - public static boolean IsFile(Context context, String dir) - { - AssetManager assetMgr = context.getAssets(); - String[] assets; - try { - assets = assetMgr.list(dir); - if (assets != null && assets.length > 0) - { - return false; - } - - return true; - } catch (IOException e) { - e.printStackTrace(); - return false; - } - } - - public static int GetFileSize(Context context, String file) - { - int ret = 0; - try { - if (file.startsWith("/")) - file = file.substring(1); - - AssetFileDescriptor afd = context.getAssets().openFd(file); - ret = (int)afd.getLength(); - - afd.close(); - } catch (IOException e) { - e.printStackTrace(); - } - return ret; - } - - public static void OpenURL(Context context, String url) - { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - context.startActivity(browserIntent); - } -} diff --git a/engine/compilers/android/src/com/garagegames/torque2d/FontManager.java b/engine/compilers/android/src/com/garagegames/torque2d/FontManager.java deleted file mode 100644 index 677f1baf4..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/FontManager.java +++ /dev/null @@ -1,287 +0,0 @@ -package com.garagegames.torque2d; -/* - * Copyright (C) 2011 George Yunaev @ Ulduzsoft - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - */ - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.RandomAccessFile; -import java.util.HashMap; - -import android.content.Context; -import android.content.res.AssetManager; -import android.util.Log; - -public class FontManager -{ - static private HashMap< String, String > fonts = null; - // This function enumerates all fonts on Android system and returns the HashMap with the font - // absolute file name as key, and the font literal name (embedded into the font) as value. - static public void enumerateFonts(Context context) - { - String[] fontdirs = { "/system/fonts", "/system/font", "/data/fonts" }; - fonts = new HashMap< String, String >(); - TTFAnalyzer analyzer = new TTFAnalyzer(); - - for ( String fontdir : fontdirs ) - { - File dir = new File( fontdir ); - - if ( !dir.exists() ) - continue; - - File[] files = dir.listFiles(); - - if ( files == null ) - continue; - - for ( File file : files ) - { - String fontname = analyzer.getTtfFontName( file.getAbsolutePath() ); - - if ( fontname != null ) - fonts.put( file.getAbsolutePath(), fontname ); - } - - } - - AssetManager assetMgr = context.getAssets(); - String[] customFonts; - try { - customFonts = assetMgr.list("fonts"); - for (String customFont : customFonts) - { - if (customFont.endsWith(".ttf")) - { - String customFontPath = copyCustomFontToCache(customFont, assetMgr, context); - String fontname = analyzer.getTtfFontName( customFontPath ); - - if ( fontname != null ) - fonts.put( customFontPath, fontname ); - } - } - - - } catch (IOException e) { - - } - - } - - static public String copyCustomFontToCache(String customFont, AssetManager assetMgr, Context context) - { - InputStream fis = null; - File tmpFile = null; - String outFilePath = ""; - try { - fis = assetMgr.open("fonts/" + customFont); - // We'll create a file in the application's cache directory - File dir = context.getCacheDir(); - dir.mkdirs(); - tmpFile = new File(dir, customFont); - if (tmpFile.exists()) { - // Delete the temporary file if it already exists - tmpFile.delete(); - } - FileOutputStream fos = null; - try { - // Write the asset file to the temporary location - fos = new FileOutputStream(tmpFile); - byte[] buffer = new byte[1024]; - int bufferLen; - while ((bufferLen = fis.read(buffer)) != -1) { - fos.write(buffer, 0, bufferLen); - } - } finally { - if (fos != null) { - try { - fos.close(); - } catch (IOException e) {} - } - } - - outFilePath = dir + "/" + customFont; - - } catch (IOException e) { - Log.e("torque2d", "Failed reading asset", e); - } finally { - if (fis != null) { - try { - fis.close(); - } catch (IOException e) {} - } - - } - - return outFilePath; - } - - static public void dumpFontList() - { - //print list - for (String key : fonts.keySet()) - { - Log.i("torque2d", "font: " + fonts.get(key)); - } - } - - static public String getFont(String fontName) - { - for (String key : fonts.keySet()) - { - String data = fonts.get(key); - if (!fontName.contains("Italic") && !fontName.contains("Bold")) - { - if (data.contains(fontName) && !data.contains("Italic") && !data.contains("Bold")) - return key; - } else { - if (data.contains(fontName)) - return key; - } - } - - return null; - } -} - -// The class which loads the TTF file, parses it and returns the TTF font name -class TTFAnalyzer -{ - // This function parses the TTF file and returns the font name specified in the file - public String getTtfFontName( String fontFilename ) - { - try - { - // Parses the TTF file format. - // See http://developer.apple.com/fonts/ttrefman/rm06/Chap6.html - m_file = new RandomAccessFile( fontFilename, "r" ); - - // Read the version first - int version = readDword(); - - // The version must be either 'true' (0x74727565) or 0x00010000 - if ( version != 0x74727565 && version != 0x00010000 ) - return null; - - // The TTF file consist of several sections called "tables", and we need to know how many of them are there. - int numTables = readWord(); - - // Skip the rest in the header - readWord(); // skip searchRange - readWord(); // skip entrySelector - readWord(); // skip rangeShift - - // Now we can read the tables - for ( int i = 0; i < numTables; i++ ) - { - // Read the table entry - int tag = readDword(); - readDword(); // skip checksum - int offset = readDword(); - int length = readDword(); - - // Now here' the trick. 'name' field actually contains the textual string name. - // So the 'name' string in characters equals to 0x6E616D65 - if ( tag == 0x6E616D65 ) - { - // Here's the name section. Read it completely into the allocated buffer - byte[] table = new byte[ length ]; - - m_file.seek( offset ); - read( table ); - - // This is also a table. See http://developer.apple.com/fonts/ttrefman/rm06/Chap6name.html - // According to Table 36, the total number of table records is stored in the second word, at the offset 2. - // Getting the count and string offset - remembering it's big endian. - int count = getWord( table, 2 ); - int string_offset = getWord( table, 4 ); - - // Record starts from offset 6 - for ( int record = 0; record < count; record++ ) - { - // Table 37 tells us that each record is 6 words -> 12 bytes, and that the nameID is 4th word so its offset is 6. - // We also need to account for the first 6 bytes of the header above (Table 36), so... - int nameid_offset = record * 12 + 6; - int platformID = getWord( table, nameid_offset ); - int nameid_value = getWord( table, nameid_offset + 6 ); - - // Table 42 lists the valid name Identifiers. We're interested in 4 but not in Unicode encoding (for simplicity). - // The encoding is stored as PlatformID and we're interested in Mac encoding - if ( nameid_value == 4 && platformID == 1 ) - { - // We need the string offset and length, which are the word 6 and 5 respectively - int name_length = getWord( table, nameid_offset + 8 ); - int name_offset = getWord( table, nameid_offset + 10 ); - - // The real name string offset is calculated by adding the string_offset - name_offset = name_offset + string_offset; - - // Make sure it is inside the array - if ( name_offset >= 0 && name_offset + name_length < table.length ) - return new String( table, name_offset, name_length ); - } - } - } - } - - return null; - } - catch (FileNotFoundException e) - { - // Permissions? - return null; - } - catch (IOException e) - { - // Most likely a corrupted font file - return null; - } - } - - // Font file; must be seekable - private RandomAccessFile m_file = null; - - // Helper I/O functions - private int readByte() throws IOException - { - return m_file.read() & 0xFF; - } - - private int readWord() throws IOException - { - int b1 = readByte(); - int b2 = readByte(); - - return b1 << 8 | b2; - } - - private int readDword() throws IOException - { - int b1 = readByte(); - int b2 = readByte(); - int b3 = readByte(); - int b4 = readByte(); - - return b1 << 24 | b2 << 16 | b3 << 8 | b4; - } - - private void read( byte [] array ) throws IOException - { - if ( m_file.read( array ) != array.length ) - throw new IOException(); - } - - // Helper - private int getWord( byte [] array, int offset ) - { - int b1 = array[ offset ] & 0xFF; - int b2 = array[ offset + 1 ] & 0xFF; - - return b1 << 8 | b2; - } -} \ No newline at end of file diff --git a/engine/compilers/android/src/com/garagegames/torque2d/MyNativeActivity.java b/engine/compilers/android/src/com/garagegames/torque2d/MyNativeActivity.java deleted file mode 100644 index 97e08dd7e..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/MyNativeActivity.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.garagegames.torque2d; - -import android.app.NativeActivity; - -public class MyNativeActivity extends NativeActivity { - static { - System.loadLibrary("openal"); - } -} diff --git a/engine/compilers/android/src/com/garagegames/torque2d/SplashScreen.java b/engine/compilers/android/src/com/garagegames/torque2d/SplashScreen.java deleted file mode 100644 index d2987dc3c..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/SplashScreen.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.garagegames.torque2d; - -import java.io.IOException; -import java.io.InputStream; - -import android.app.Activity; -import android.app.Dialog; -import android.content.Context; -import android.content.res.AssetManager; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Color; -import android.view.Window; -import android.view.WindowManager; -import android.widget.ImageView; -import android.widget.ImageView.ScaleType; - -public class SplashScreen extends Dialog { - - public SplashScreen(Context context, int theme) { - super(context, theme); - } - - private static SplashScreen _instance = null; - - public static void ToggleSplashScreen(final Context context, final boolean show, final int screenWidth, final int screenHeight) - { - if (show) - { - final Activity activity = (Activity)context; - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - - _instance = new SplashScreen(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen); - - try { - AssetManager assetMgr = context.getAssets(); - InputStream stream = assetMgr.open("splash.png"); - Bitmap splashBitmap = Bitmap.createScaledBitmap(BitmapFactory.decodeStream(stream), screenWidth, screenHeight, true); - - ImageView view = new ImageView(context); - view.setPadding(0, 0, 0, 0); - view.setImageBitmap(splashBitmap); - view.setScaleType(ScaleType.FIT_CENTER); - view.setBackgroundColor(Color.BLACK); - _instance.getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, - WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); - _instance.requestWindowFeature(Window.FEATURE_NO_TITLE); - _instance.setCancelable(false); - _instance.setContentView(view); - _instance.show(); - - } catch (IOException e) { - - } - } - }); - } - else - { - if (_instance != null) - { - _instance.dismiss(); - _instance = null; - } - } - } -} diff --git a/engine/compilers/android/src/com/garagegames/torque2d/StreamingAudioPlayer.java b/engine/compilers/android/src/com/garagegames/torque2d/StreamingAudioPlayer.java deleted file mode 100644 index 19c4fa12e..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/StreamingAudioPlayer.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.garagegames.torque2d; - -import java.io.IOException; - -import android.content.Context; -import android.content.res.AssetFileDescriptor; -import android.media.MediaPlayer; -import android.util.Log; - -public class StreamingAudioPlayer { - - private static MediaPlayer mediaPlayer = null; - - public static void LoadMusicTrack(Context context, String filename) - { - mediaPlayer = new MediaPlayer(); - AssetFileDescriptor fd; - try { - fd = context.getAssets().openFd(filename); - if (fd == null) - Log.i("torque2d", "failed to load music file " + filename); - - mediaPlayer.setDataSource(fd.getFileDescriptor(),fd.getStartOffset(),fd.getLength()); - mediaPlayer.prepare(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - public static void UnLoadMusicTrack() - { - if (mediaPlayer == null) - return; - - mediaPlayer.stop(); - mediaPlayer.release(); - mediaPlayer = null; - - } - - public static boolean isMusicTrackPlaying() - { - if (mediaPlayer == null) - return false; - - return mediaPlayer.isPlaying(); - } - - public static void startMusicTrack() - { - if (mediaPlayer == null) - return; - - mediaPlayer.start(); - } - - public static void stopMusicTrack() - { - if (mediaPlayer == null) - return; - - mediaPlayer.stop(); - } - - public static void setMusicTrackVolume(float volume) - { - if (mediaPlayer == null) - return; - - mediaPlayer.setVolume(volume, volume); - } - -} diff --git a/engine/compilers/android/src/com/garagegames/torque2d/T2DUtilities.java b/engine/compilers/android/src/com/garagegames/torque2d/T2DUtilities.java deleted file mode 100644 index c13d242f8..000000000 --- a/engine/compilers/android/src/com/garagegames/torque2d/T2DUtilities.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.garagegames.torque2d; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.net.Uri; - -public class T2DUtilities { - - public static void OpenURL(Context context, String url) - { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - context.startActivity(browserIntent); - } - - public static void DisplayAlertOK(final Context context, final String title, final String message) - { - final Activity activity = (Activity)context; - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setMessage(message); - builder.setTitle(title); - builder.setCancelable(false); - builder.setNeutralButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - alert = null; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - }); - } - - private static int retValue = -1; - private static AlertDialog alert = null; - - public static void DisplayAlertOKCancel(final Context context, final String title, final String message) - { - retValue = -1; - final Activity activity = (Activity)context; - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setMessage(message); - builder.setTitle(title); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 1; - alert = null; - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 0; - alert = null; - } - }); - alert = builder.create(); - alert.show(); - } - }); - } - - public static int CheckAlert() - { - if (alert == null && retValue == -1) - return -1; - - if (retValue == -1) - return -1; - - if (alert != null && alert.isShowing()) - return -1; - - return retValue; - } - - public static void DisplayAlertRetry(final Context context, final String title, final String message) - { - retValue = -1; - final Activity activity = (Activity)context; - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setMessage(message); - builder.setTitle(title); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 1; - alert = null; - } - }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 0; - alert = null; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - }); - } - - public static void DisplayAlertYesNo(final Context context, final String title, final String message) - { - retValue = -1; - final Activity activity = (Activity)context; - activity.runOnUiThread(new Runnable() { - @Override - public void run() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setMessage(message); - builder.setTitle(title); - builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 1; - alert = null; - } - }); - builder.setNegativeButton("No", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - retValue = 0; - alert = null; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - }); - } -} diff --git a/engine/compilers/emscripten/CMakeLists.txt b/engine/compilers/emscripten/CMakeLists.txt index 6d49df937..c79e3ae19 100644 --- a/engine/compilers/emscripten/CMakeLists.txt +++ b/engine/compilers/emscripten/CMakeLists.txt @@ -172,6 +172,7 @@ SET(T2D_SRCS ../../source/2d/assets/ParticleAssetField.cc ../../source/2d/assets/ParticleAssetFieldCollection.cc ../../source/2d/assets/SkeletonAsset.cc + ../../source/2d/assets/FontAsset.cc ../../source/2d/controllers/AmbientForceController.cc ../../source/2d/controllers/BuoyancyController.cc ../../source/2d/controllers/core/GroupedSceneController.cc @@ -225,6 +226,10 @@ SET(T2D_SRCS ../../source/audio/audioDataBlock.cc ../../source/audio/audioStreamSourceFactory.cc ../../source/audio/wavStreamSource.cc + ../../source/audio/audioDescriptions.cc + ../../source/audio/vorbisStreamSource.cc + ../../source/bitmapFont/BitmapFont.cc + ../../source/bitmapFont/BitmapFontCharacter.cc ../../source/collection/bitTables.cc ../../source/collection/hashTable.cc ../../source/collection/undo.cc @@ -337,6 +342,7 @@ SET(T2D_SRCS ../../source/input/actionMap.cc ../../source/io/bitStream.cc ../../source/io/bufferStream.cc + ../../source/io/byteBuffer.cpp ../../source/io/fileObject.cc ../../source/io/fileStream.cc ../../source/io/fileStreamObject.cc @@ -505,4 +511,3 @@ ${T2D_SRCS}) add_dependencies(Torque2D.html Assets) #em_link_js_library - diff --git a/engine/lib/freetype/android/lib/libfreetype.a b/engine/lib/freetype/android/lib/armeabi-v7a/libfreetype.a similarity index 100% rename from engine/lib/freetype/android/lib/libfreetype.a rename to engine/lib/freetype/android/lib/armeabi-v7a/libfreetype.a diff --git a/engine/lib/freetype/android/lib/x86/libfreetype.a b/engine/lib/freetype/android/lib/x86/libfreetype.a new file mode 100644 index 000000000..6541b0eb2 Binary files /dev/null and b/engine/lib/freetype/android/lib/x86/libfreetype.a differ diff --git a/engine/lib/freetype/android/lib/x86_64/libfreetype.a b/engine/lib/freetype/android/lib/x86_64/libfreetype.a new file mode 100644 index 000000000..c8c567738 Binary files /dev/null and b/engine/lib/freetype/android/lib/x86_64/libfreetype.a differ diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALc.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALc.o.d deleted file mode 100644 index 4865a78eb..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALc.o.d +++ /dev/null @@ -1,218 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALc.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/ALc.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALu.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALu.o.d deleted file mode 100644 index a5166b545..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALu.o.d +++ /dev/null @@ -1,215 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALu.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/ALu.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcConfig.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcConfig.o.d deleted file mode 100644 index 1102bef2f..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcConfig.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcConfig.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcConfig.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcEcho.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcEcho.o.d deleted file mode 100644 index cc6f55a03..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcEcho.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcEcho.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcEcho.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcModulator.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcModulator.o.d deleted file mode 100644 index a4df349f2..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcModulator.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcModulator.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcModulator.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcReverb.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcReverb.o.d deleted file mode 100644 index 89cbd6c85..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcReverb.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcReverb.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcReverb.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcRing.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcRing.o.d deleted file mode 100644 index 1f1e14cc2..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcRing.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcRing.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcRing.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcThread.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcThread.o.d deleted file mode 100644 index a16cfaa52..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcThread.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcThread.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcThread.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/android.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/android.o.d deleted file mode 100644 index 400a45e96..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/android.o.d +++ /dev/null @@ -1,179 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/android.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/android.c \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/audiotrack.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/audiotrack.o.d deleted file mode 100644 index c21ae3e01..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/audiotrack.o.d +++ /dev/null @@ -1,194 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/audiotrack.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/audiotrack.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/bs2b.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/bs2b.o.d deleted file mode 100644 index 39170bf41..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/bs2b.o.d +++ /dev/null @@ -1,83 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/bs2b.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/bs2b.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/mixer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/mixer.o.d deleted file mode 100644 index d2e1213b0..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/mixer.o.d +++ /dev/null @@ -1,215 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/mixer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/mixer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/null.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/null.o.d deleted file mode 100644 index 5b0d32240..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/null.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/null.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/null.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/opensles.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/opensles.o.d deleted file mode 100644 index 23a7567cb..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/opensles.o.d +++ /dev/null @@ -1,224 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/opensles.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/opensles.c \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/stat.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stat.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/dlfcn.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/prctl.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/prctl.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Platform.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Android.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/stat.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stat.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/dlfcn.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/prctl.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/prctl.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Platform.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Android.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/panning.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/panning.o.d deleted file mode 100644 index c2536c87d..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/panning.o.d +++ /dev/null @@ -1,194 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/panning.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/panning.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d deleted file mode 100644 index a0ec2c00a..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alAuxEffectSlot.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alAuxEffectSlot.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alBuffer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alBuffer.o.d deleted file mode 100644 index 145382450..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alBuffer.o.d +++ /dev/null @@ -1,200 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alBuffer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alBuffer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alDatabuffer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alDatabuffer.o.d deleted file mode 100644 index 1f942f534..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alDatabuffer.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alDatabuffer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alDatabuffer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alEffect.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alEffect.o.d deleted file mode 100644 index 7d3c63195..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alEffect.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alEffect.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alEffect.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alError.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alError.o.d deleted file mode 100644 index c8422c62d..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alError.o.d +++ /dev/null @@ -1,179 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alError.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alError.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alExtension.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alExtension.o.d deleted file mode 100644 index fb9fd2c6c..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alExtension.o.d +++ /dev/null @@ -1,218 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alExtension.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alExtension.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alFilter.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alFilter.o.d deleted file mode 100644 index 0f00f681a..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alFilter.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alFilter.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alFilter.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alListener.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alListener.o.d deleted file mode 100644 index 17ab1ebae..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alListener.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alListener.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alListener.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alSource.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alSource.o.d deleted file mode 100644 index beea4613f..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alSource.o.d +++ /dev/null @@ -1,209 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alSource.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alSource.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alState.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alState.o.d deleted file mode 100644 index b23264f1a..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alState.o.d +++ /dev/null @@ -1,203 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alState.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alState.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alState.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alState.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alThunk.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alThunk.o.d deleted file mode 100644 index 6f0f6fe20..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alThunk.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alThunk.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alThunk.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALc.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALc.o.d deleted file mode 100644 index 953a6c43a..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALc.o.d +++ /dev/null @@ -1,218 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALc.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/ALc.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALu.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALu.o.d deleted file mode 100644 index c003cfe37..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALu.o.d +++ /dev/null @@ -1,215 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALu.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/ALu.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcConfig.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcConfig.o.d deleted file mode 100644 index c83dccbc4..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcConfig.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcConfig.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcConfig.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcEcho.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcEcho.o.d deleted file mode 100644 index 139eddd99..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcEcho.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcEcho.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcEcho.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcModulator.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcModulator.o.d deleted file mode 100644 index 1d7511446..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcModulator.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcModulator.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcModulator.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcReverb.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcReverb.o.d deleted file mode 100644 index 83142d785..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcReverb.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcReverb.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcReverb.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcRing.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcRing.o.d deleted file mode 100644 index 2e7b2eda7..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcRing.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcRing.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcRing.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcThread.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcThread.o.d deleted file mode 100644 index d6ae7ea21..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcThread.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcThread.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/alcThread.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/android.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/android.o.d deleted file mode 100644 index d0a8894fb..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/android.o.d +++ /dev/null @@ -1,179 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/android.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/android.c \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/audiotrack.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/audiotrack.o.d deleted file mode 100644 index a9ab247f2..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/audiotrack.o.d +++ /dev/null @@ -1,194 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/audiotrack.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/audiotrack.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/bs2b.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/bs2b.o.d deleted file mode 100644 index cfa458194..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/bs2b.o.d +++ /dev/null @@ -1,83 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/bs2b.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/bs2b.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/mixer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/mixer.o.d deleted file mode 100644 index a7d39d5bb..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/mixer.o.d +++ /dev/null @@ -1,215 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/mixer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/mixer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/bs2b.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/null.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/null.o.d deleted file mode 100644 index 634ee8166..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/null.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/null.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/null.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/opensles.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/opensles.o.d deleted file mode 100644 index 74ad75e8b..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/opensles.o.d +++ /dev/null @@ -1,224 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/opensles.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/opensles.c \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/stat.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stat.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/endian.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/dlfcn.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/prctl.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/prctl.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Platform.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Android.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/stat.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stat.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/endian.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/dlfcn.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/prctl.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/prctl.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/jni.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Platform.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/SLES/OpenSLES_Android.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/apportable_openal_funcs.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/panning.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/panning.o.d deleted file mode 100644 index 3505f6a91..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/panning.o.d +++ /dev/null @@ -1,194 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/panning.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/Alc/panning.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d deleted file mode 100644 index 6c076a534..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d +++ /dev/null @@ -1,206 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alAuxEffectSlot.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alAuxEffectSlot.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alBuffer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alBuffer.o.d deleted file mode 100644 index f0ea553ef..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alBuffer.o.d +++ /dev/null @@ -1,200 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alBuffer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alBuffer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alDatabuffer.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alDatabuffer.o.d deleted file mode 100644 index 0966118a8..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alDatabuffer.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alDatabuffer.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alDatabuffer.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alEffect.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alEffect.o.d deleted file mode 100644 index 219b3a72f..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alEffect.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alEffect.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alEffect.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alError.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alError.o.d deleted file mode 100644 index eca2adb74..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alError.o.d +++ /dev/null @@ -1,179 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alError.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alError.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alExtension.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alExtension.o.d deleted file mode 100644 index 664d8ac7f..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alExtension.o.d +++ /dev/null @@ -1,218 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alExtension.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alExtension.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/ctype.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alFilter.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alFilter.o.d deleted file mode 100644 index 33486f2a0..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alFilter.o.d +++ /dev/null @@ -1,197 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alFilter.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alFilter.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alListener.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alListener.o.d deleted file mode 100644 index dbbd7b452..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alListener.o.d +++ /dev/null @@ -1,188 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alListener.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alListener.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alSource.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alSource.o.d deleted file mode 100644 index 88a2bb3b6..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alSource.o.d +++ /dev/null @@ -1,209 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alSource.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alSource.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alBuffer.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alAuxEffectSlot.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alEffect.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alState.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alState.o.d deleted file mode 100644 index 2f4a7dad9..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alState.o.d +++ /dev/null @@ -1,203 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alState.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alState.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alState.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alError.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alSource.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alFilter.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alState.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alDatabuffer.h: diff --git a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alThunk.o.d b/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alThunk.o.d deleted file mode 100644 index 0b2c33967..000000000 --- a/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alThunk.o.d +++ /dev/null @@ -1,191 +0,0 @@ -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alThunk.o: \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/alThunk.c \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h \ - /Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h \ - /Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/config.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdlib.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/api-level.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/string.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/malloc.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/alloca.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/strings.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdint.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/stddef.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/compiler.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/posix_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/kernel.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysmacros.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/memory.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alMain.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/stdio.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/fenv.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/al.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/android/log.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alc.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/alext.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/include/AL/efx.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/unistd.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/select.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/internal_types.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/machine/limits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/syslimits.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/page.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/signal.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/sigcontext.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sys/sysconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/capability.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pathconf.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/assert.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/pthread.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/time.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/sched.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/linux/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alListener.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alu.h: - -/Users/tnewell/androidDev/android-ndk-r9/platforms/android-9/arch-arm/usr/include/math.h: - -/Users/tnewell/gitrepos/Torque2D/engine/lib/openal/Android/openal-soft-master/jni/OpenAL/OpenAL32/Include/alThunk.h: diff --git a/engine/lib/openal/Android/x86_64/libopenal.so b/engine/lib/openal/Android/x86_64/libopenal.so new file mode 100755 index 000000000..7b04a04f0 Binary files /dev/null and b/engine/lib/openal/Android/x86_64/libopenal.so differ diff --git a/engine/source/2d/assets/ImageAsset.cc b/engine/source/2d/assets/ImageAsset.cc index a0bffee0e..684a2963a 100755 --- a/engine/source/2d/assets/ImageAsset.cc +++ b/engine/source/2d/assets/ImageAsset.cc @@ -197,7 +197,7 @@ void ImageAsset::initPersistFields() addProtectedField("ImageFile", TypeAssetLooseFilePath, Offset(mImageFile, ImageAsset), &setImageFile, &getImageFile, &defaultProtectedWriteFn, ""); addProtectedField("Force16bit", TypeBool, Offset(mForce16Bit, ImageAsset), &setForce16Bit, &defaultProtectedGetFn, &writeForce16Bit, ""); addProtectedField("FilterMode", TypeEnum, Offset(mLocalFilterMode, ImageAsset), &setFilterMode, &defaultProtectedGetFn, &writeFilterMode, 1, &textureFilterTable); - addProtectedField("ExplicitMode", TypeBool, Offset(mExplicitMode, ImageAsset), &setExplicitMode, &defaultProtectedGetFn, &defaultProtectedNotWriteFn, ""); + addProtectedField("ExplicitMode", TypeBool, Offset(mExplicitMode, ImageAsset), &setExplicitMode, &defaultProtectedGetFn, &writeExplicitMode, ""); addProtectedField("CellRowOrder", TypeBool, Offset(mCellRowOrder, ImageAsset), &setCellRowOrder, &defaultProtectedGetFn, &writeCellRowOrder, ""); addProtectedField("CellOffsetX", TypeS32, Offset(mCellOffsetX, ImageAsset), &setCellOffsetX, &defaultProtectedGetFn, &writeCellOffsetX, ""); diff --git a/engine/source/2d/assets/ImageAsset.h b/engine/source/2d/assets/ImageAsset.h index 7c3a65582..79c81e593 100755 --- a/engine/source/2d/assets/ImageAsset.h +++ b/engine/source/2d/assets/ImageAsset.h @@ -301,6 +301,7 @@ class ImageAsset : public AssetBase static bool writeFilterMode( void* obj, StringTableEntry pFieldName ) { return static_cast(obj)->getFilterMode() != FILTER_BILINEAR; } static bool setExplicitMode( void* obj, const char* data ) { static_cast(obj)->setExplicitMode(dAtob(data)); return false; } + static bool writeExplicitMode(void* obj, StringTableEntry pFieldName) { ImageAsset* pImageAsset = static_cast(obj); return pImageAsset->getExplicitMode(); } static bool setCellRowOrder( void* obj, const char* data ) { static_cast(obj)->setCellRowOrder(dAtob(data)); return false; } static bool writeCellRowOrder( void* obj, StringTableEntry pFieldName ) { ImageAsset* pImageAsset = static_cast(obj); return !pImageAsset->getExplicitMode() && !pImageAsset->getCellRowOrder(); } diff --git a/engine/source/2d/assets/ImageAsset_ScriptBinding.h b/engine/source/2d/assets/ImageAsset_ScriptBinding.h index bcc2609c9..4275c0855 100755 --- a/engine/source/2d/assets/ImageAsset_ScriptBinding.h +++ b/engine/source/2d/assets/ImageAsset_ScriptBinding.h @@ -585,4 +585,21 @@ ConsoleMethodWithDocs(ImageAsset, getExplicitCellIndex, ConsoleInt, 3, 3, (cellN return object->getExplicitCellIndex( argv[2] ); } +/*! Gets the status of Explicit mode +@return Returns true if ExplicitMode is on, false otherwise. +*/ +ConsoleMethodWithDocs(ImageAsset, getExplicitMode, ConsoleBool, 2, 2, ()) +{ + return object->getExplicitMode(); +} + +/*! Sets Explicit Mode +@param explicitMode Whether to set Explicit Mode or disable it +@return No return value. +*/ +ConsoleMethodWithDocs(ImageAsset, setExplicitMode, ConsoleVoid, 3, 3, (explicitMode)) +{ + object->setExplicitMode(dAtob(argv[2])); +} + ConsoleMethodGroupEndWithDocs(ImageAsset) diff --git a/engine/source/2d/core/SpriteBatch.cc b/engine/source/2d/core/SpriteBatch.cc index d47c29df6..e765d06c8 100755 --- a/engine/source/2d/core/SpriteBatch.cc +++ b/engine/source/2d/core/SpriteBatch.cc @@ -533,7 +533,7 @@ U32 SpriteBatch::getSpriteImageFrame( void ) const { // Finish if a sprite is not selected. if ( !checkSpriteSelected() ) - return NULL; + return 0; // Get image frame. return mSelectedSprite->getImageFrame(); @@ -611,7 +611,7 @@ U32 SpriteBatch::getSpriteAnimationFrame(void) const { // Finish if a sprite is not selected. if (!checkSpriteSelected()) - return NULL; + return 0; // Get image frame. return mSelectedSprite->getAnimationFrame(); @@ -1239,6 +1239,18 @@ SpriteBatchItem* SpriteBatch::createSprite( const SpriteBatchItem::LogicalPositi //------------------------------------------------------------------------------ +void SpriteBatch::integrateSprites(const F32 totalTime, const F32 elapsedTime, DebugStats* pDebugStats) +{ + //process the elapsed time for all sprites + for (typeSpriteBatchHash::iterator spriteItr = mSprites.begin(); spriteItr != mSprites.end(); ++spriteItr) + { + // Update image frame provider. + spriteItr->value->ImageFrameProvider::update(elapsedTime); + } +} + +//------------------------------------------------------------------------------ + void SpriteBatch::setBatchTransform( const b2Transform& batchTransform ) { // Update world transform. diff --git a/engine/source/2d/core/SpriteBatch.h b/engine/source/2d/core/SpriteBatch.h index b76d241f8..a6e00ae77 100755 --- a/engine/source/2d/core/SpriteBatch.h +++ b/engine/source/2d/core/SpriteBatch.h @@ -198,6 +198,8 @@ class SpriteBatch virtual SpriteBatchItem* createSprite( const SpriteBatchItem::LogicalPosition& logicalPosition ); + void integrateSprites(const F32 totalTime, const F32 elapsedTime, DebugStats* pDebugStats); + void setBatchTransform( const b2Transform& batchTransform ); void updateLocalExtents( void ); diff --git a/engine/source/2d/core/SpriteBatchItem.cc b/engine/source/2d/core/SpriteBatchItem.cc index 119f94e3a..bb4f4b429 100755 --- a/engine/source/2d/core/SpriteBatchItem.cc +++ b/engine/source/2d/core/SpriteBatchItem.cc @@ -133,8 +133,8 @@ void SpriteBatchItem::resetState( void ) mUserData = NULL; - // Require self ticking. - mSelfTick = true; + // Only animates if the scene is not paused. + mSelfTick = false; } //------------------------------------------------------------------------------ diff --git a/engine/source/2d/core/Vector2_ScriptBinding.h b/engine/source/2d/core/Vector2_ScriptBinding.h index 096ef9fe4..1140c33b1 100755 --- a/engine/source/2d/core/Vector2_ScriptBinding.h +++ b/engine/source/2d/core/Vector2_ScriptBinding.h @@ -202,7 +202,7 @@ ConsoleFunctionWithDocs( Vector2Compare, ConsoleBool, 3, 4, (Vector2 p1, Vector2 if (Utility::mGetStringElementCount(argv[1]) < 2 ||Utility::mGetStringElementCount(argv[2]) < 2 ) { Con::warnf("Vector2Compare() - Invalid number of parameters!"); - return NULL; + return false; } Vector2 p1( argv[1] ); @@ -228,7 +228,7 @@ ConsoleFunctionWithDocs( Vector2Distance, ConsoleFloat, 3, 3, (Vector2 p1, Vecto if (Utility::mGetStringElementCount(argv[1]) < 2 ||Utility::mGetStringElementCount(argv[2]) < 2 ) { Con::warnf("Vector2Distance() - Invalid number of parameters!"); - return NULL; + return false; } Vector2 p1( argv[1] ); @@ -247,7 +247,7 @@ ConsoleFunctionWithDocs( Vector2AngleBetween, ConsoleFloat, 3, 3, (Vector2 v1, V if (Utility::mGetStringElementCount(argv[1]) < 2 ||Utility::mGetStringElementCount(argv[2]) < 2 ) { Con::warnf("t2dAngleBetween() - Invalid number of parameters!"); - return NULL; + return false; } Vector2 v1( argv[1] ); @@ -269,7 +269,7 @@ ConsoleFunctionWithDocs( Vector2AngleToPoint, ConsoleFloat, 3, 3, (Vector2 p1, V if (Utility::mGetStringElementCount(argv[1]) < 2 ||Utility::mGetStringElementCount(argv[2]) < 2 ) { Con::warnf("t2dAngleToPoint() - Invalid number of parameters!"); - return NULL; + return false; } Vector2 p1( argv[1] ); diff --git a/engine/source/2d/scene/Scene.cc b/engine/source/2d/scene/Scene.cc index ff0492309..14f0838c5 100755 --- a/engine/source/2d/scene/Scene.cc +++ b/engine/source/2d/scene/Scene.cc @@ -503,36 +503,60 @@ void Scene::dispatchBeginContactCallbacks( void ) dSprintf( sceneObjectABuffer, sizeof(sceneObjectABuffer), "%d", pSceneObjectA->getId() ); dSprintf( sceneObjectBBuffer, sizeof(sceneObjectBBuffer), "%d", pSceneObjectB->getId() ); - // Format miscellaneous information. - char miscInfoBuffer[128]; + // Format miscellaneous information twice so object b can see things from his point of view. + char miscInfoBufferA[128]; + char miscInfoBufferB[128]; if ( pointCount == 2 ) { - dSprintf(miscInfoBuffer, sizeof(miscInfoBuffer), + dSprintf(miscInfoBufferA, sizeof(miscInfoBufferA), "%d %d %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f", shapeIndexA, shapeIndexB, - normal.x, normal.y, + -normal.x, -normal.y, point1.x, point1.y, normalImpulse1, tangentImpulse1, point2.x, point2.y, normalImpulse2, tangentImpulse2 ); + + dSprintf(miscInfoBufferB, sizeof(miscInfoBufferB), + "%d %d %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f", + shapeIndexB, shapeIndexA, + normal.x, normal.y, + point1.x, point1.y, + normalImpulse1, + tangentImpulse1, + point2.x, point2.y, + normalImpulse2, + tangentImpulse2); } else if ( pointCount == 1 ) { - dSprintf(miscInfoBuffer, sizeof(miscInfoBuffer), + dSprintf(miscInfoBufferA, sizeof(miscInfoBufferA), "%d %d %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f", shapeIndexA, shapeIndexB, - normal.x, normal.y, + -normal.x, -normal.y, point1.x, point1.y, normalImpulse1, tangentImpulse1 ); + + dSprintf(miscInfoBufferB, sizeof(miscInfoBufferB), + "%d %d %0.4f %0.4f %0.4f %0.4f %0.4f %0.4f", + shapeIndexB, shapeIndexA, + normal.x, normal.y, + point1.x, point1.y, + normalImpulse1, + tangentImpulse1); } else { - dSprintf(miscInfoBuffer, sizeof(miscInfoBuffer), + dSprintf(miscInfoBufferA, sizeof(miscInfoBufferA), "%d %d", shapeIndexA, shapeIndexB ); + + dSprintf(miscInfoBufferB, sizeof(miscInfoBufferB), + "%d %d", + shapeIndexB, shapeIndexA); } // Does the scene handle the collision callback? @@ -543,12 +567,12 @@ void Scene::dispatchBeginContactCallbacks( void ) Con::executef( this, 4, "onSceneCollision", sceneObjectABuffer, sceneObjectBBuffer, - miscInfoBuffer ); + miscInfoBufferA ); } else { // No, so call it on its behaviors. - const char* args[5] = { "onSceneCollision", "", sceneObjectABuffer, sceneObjectBBuffer, miscInfoBuffer }; + const char* args[5] = { "onSceneCollision", "", sceneObjectABuffer, sceneObjectBBuffer, miscInfoBufferA }; callOnBehaviors( 5, args ); } @@ -562,12 +586,12 @@ void Scene::dispatchBeginContactCallbacks( void ) // Yes, so perform the script callback on it. Con::executef( pSceneObjectA, 3, "onCollision", sceneObjectBBuffer, - miscInfoBuffer ); + miscInfoBufferA ); } else { // No, so call it on its behaviors. - const char* args[4] = { "onCollision", "", sceneObjectBBuffer, miscInfoBuffer }; + const char* args[4] = { "onCollision", "", sceneObjectBBuffer, miscInfoBufferA }; pSceneObjectA->callOnBehaviors( 4, args ); } } @@ -582,12 +606,12 @@ void Scene::dispatchBeginContactCallbacks( void ) // Yes, so perform the script callback on it. Con::executef( pSceneObjectB, 3, "onCollision", sceneObjectABuffer, - miscInfoBuffer ); + miscInfoBufferB ); } else { // No, so call it on its behaviors. - const char* args[4] = { "onCollision", "", sceneObjectABuffer, miscInfoBuffer }; + const char* args[4] = { "onCollision", "", sceneObjectABuffer, miscInfoBufferB }; pSceneObjectB->callOnBehaviors( 4, args ); } } diff --git a/engine/source/2d/sceneobject/CompositeSprite.cc b/engine/source/2d/sceneobject/CompositeSprite.cc index 2c75c13fb..1eb8d5621 100755 --- a/engine/source/2d/sceneobject/CompositeSprite.cc +++ b/engine/source/2d/sceneobject/CompositeSprite.cc @@ -165,6 +165,8 @@ void CompositeSprite::integrateObject( const F32 totalTime, const F32 elapsedTim // Call Parent. Parent::integrateObject( totalTime, elapsedTime, pDebugStats ); + integrateSprites(totalTime, elapsedTime, pDebugStats); + // Finish if the spatials are NOT dirty. if ( !getSpatialDirty() ) return; diff --git a/engine/source/2d/sceneobject/CompositeSprite.h b/engine/source/2d/sceneobject/CompositeSprite.h index 78ec84f36..626a1e73d 100755 --- a/engine/source/2d/sceneobject/CompositeSprite.h +++ b/engine/source/2d/sceneobject/CompositeSprite.h @@ -66,6 +66,8 @@ class CompositeSprite : public SceneObject, public SpriteBatch virtual void integrateObject( const F32 totalTime, const F32 elapsedTime, DebugStats* pDebugStats ); virtual void interpolateObject( const F32 timeDelta ); + virtual inline void setSpatialDirty(void) { mSpatialDirty = true; } + virtual bool canPrepareRender( void ) const { return true; } virtual bool shouldRender( void ) const { return true; } virtual void scenePrepareRender( const SceneRenderState* pSceneRenderState, SceneRenderQueue* pSceneRenderQueue ); diff --git a/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h b/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h index 9418d7223..afee3afc6 100755 --- a/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h +++ b/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h @@ -562,6 +562,7 @@ ConsoleMethodWithDocs(CompositeSprite, setSpriteLocalPosition, ConsoleVoid, 3, 4 } object->setSpriteLocalPosition( localPosition ); + object->setSpatialDirty(); } //----------------------------------------------------------------------------- diff --git a/engine/source/2d/sceneobject/SceneObject.cc b/engine/source/2d/sceneobject/SceneObject.cc index 5130e3baa..0b2e9ebb3 100755 --- a/engine/source/2d/sceneobject/SceneObject.cc +++ b/engine/source/2d/sceneobject/SceneObject.cc @@ -293,35 +293,35 @@ void SceneObject::initPersistFields() addProtectedField("Size", TypeVector2, Offset( mSize, SceneObject), &setSize, &defaultProtectedGetFn, &writeSize, ""); /// Position / Angle. - addProtectedField("Position", TypeVector2, NULL, &setPosition, &getPosition, &writePosition, ""); - addProtectedField("Angle", TypeF32, NULL, &setAngle, &getAngle, &writeAngle, ""); - addProtectedField("FixedAngle", TypeBool, NULL, &setFixedAngle, &getFixedAngle, &writeFixedAngle, ""); + addProtectedField("Position", TypeVector2, 0, &setPosition, &getPosition, &writePosition, ""); + addProtectedField("Angle", TypeF32, 0, &setAngle, &getAngle, &writeAngle, ""); + addProtectedField("FixedAngle", TypeBool, 0, &setFixedAngle, &getFixedAngle, &writeFixedAngle, ""); /// Body. - addProtectedField("BodyType", TypeEnum, NULL, &setBodyType, &getBodyType, &writeBodyType, 1, &bodyTypeTable, "" ); - addProtectedField("Active", TypeBool, NULL, &setActive, &getActive, &writeActive, "" ); - addProtectedField("Awake", TypeBool, NULL, &setAwake, &getAwake, &writeAwake, "" ); - addProtectedField("Bullet", TypeBool, NULL, &setBullet, &getBullet, &writeBullet, "" ); - addProtectedField("SleepingAllowed", TypeBool, NULL, &setSleepingAllowed, &getSleepingAllowed, &writeSleepingAllowed, "" ); + addProtectedField("BodyType", TypeEnum, 0, &setBodyType, &getBodyType, &writeBodyType, 1, &bodyTypeTable, "" ); + addProtectedField("Active", TypeBool, 0, &setActive, &getActive, &writeActive, "" ); + addProtectedField("Awake", TypeBool, 0, &setAwake, &getAwake, &writeAwake, "" ); + addProtectedField("Bullet", TypeBool, 0, &setBullet, &getBullet, &writeBullet, "" ); + addProtectedField("SleepingAllowed", TypeBool, 0, &setSleepingAllowed, &getSleepingAllowed, &writeSleepingAllowed, "" ); /// Collision control. addProtectedField("CollisionGroups", TypeS32, Offset(mCollisionGroupMask, SceneObject), &setCollisionGroups, &getCollisionGroups, &writeCollisionGroups, ""); addProtectedField("CollisionLayers", TypeS32, Offset(mCollisionLayerMask, SceneObject), &setCollisionLayers, &getCollisionLayers, &writeCollisionLayers, ""); addField("CollisionSuppress", TypeBool, Offset(mCollisionSuppress, SceneObject), &writeCollisionSuppress, ""); addField("CollisionOneWay", TypeBool, Offset(mCollisionOneWay, SceneObject), &writeCollisionOneWay, ""); - addProtectedField("GatherContacts", TypeBool, NULL, &setGatherContacts, &defaultProtectedGetFn, &writeGatherContacts, ""); + addProtectedField("GatherContacts", TypeBool, 0, &setGatherContacts, &defaultProtectedGetFn, &writeGatherContacts, ""); addProtectedField("DefaultDensity", TypeF32, Offset( mDefaultFixture.density, SceneObject), &setDefaultDensity, &defaultProtectedGetFn, &writeDefaultDensity, ""); addProtectedField("DefaultFriction", TypeF32, Offset( mDefaultFixture.friction, SceneObject), &setDefaultFriction, &defaultProtectedGetFn, &writeDefaultFriction, ""); addProtectedField("DefaultRestitution", TypeF32, Offset( mDefaultFixture.restitution, SceneObject), &setDefaultRestitution, &defaultProtectedGetFn, &writeDefaultRestitution, ""); /// Velocities. - addProtectedField("LinearVelocity", TypeVector2, NULL, &setLinearVelocity, &getLinearVelocity, &writeLinearVelocity, ""); - addProtectedField("AngularVelocity", TypeF32, NULL, &setAngularVelocity, &getAngularVelocity, &writeAngularVelocity, ""); - addProtectedField("LinearDamping", TypeF32, NULL, &setLinearDamping, &getLinearDamping, &writeLinearDamping, ""); - addProtectedField("AngularDamping", TypeF32, NULL, &setAngularDamping, &getAngularDamping, &writeAngularDamping, ""); + addProtectedField("LinearVelocity", TypeVector2, 0, &setLinearVelocity, &getLinearVelocity, &writeLinearVelocity, ""); + addProtectedField("AngularVelocity", TypeF32, 0, &setAngularVelocity, &getAngularVelocity, &writeAngularVelocity, ""); + addProtectedField("LinearDamping", TypeF32, 0, &setLinearDamping, &getLinearDamping, &writeLinearDamping, ""); + addProtectedField("AngularDamping", TypeF32, 0, &setAngularDamping, &getAngularDamping, &writeAngularDamping, ""); /// Gravity scaling. - addProtectedField("GravityScale", TypeF32, NULL, &setGravityScale, &getGravityScale, &writeGravityScale, ""); + addProtectedField("GravityScale", TypeF32, 0, &setGravityScale, &getGravityScale, &writeGravityScale, ""); /// Render visibility. addField("Visible", TypeBool, Offset(mVisible, SceneObject), &writeVisible, ""); diff --git a/engine/source/2d/sceneobject/SceneObjectList.cc b/engine/source/2d/sceneobject/SceneObjectList.cc index 0991de768..bc2c03a98 100644 --- a/engine/source/2d/sceneobject/SceneObjectList.cc +++ b/engine/source/2d/sceneobject/SceneObjectList.cc @@ -28,7 +28,7 @@ void SceneObjectList::pushBack(SceneObject* obj) { - if (find(begin(),end(),obj) == end()) + if (::find(begin(), end(), obj) == end()) push_back(obj); } @@ -36,7 +36,7 @@ void SceneObjectList::pushBack(SceneObject* obj) void SceneObjectList::pushBackForce(SceneObject* obj) { - iterator itr = find(begin(),end(),obj); + iterator itr = ::find(begin(),end(),obj); if (itr == end()) { push_back(obj); @@ -54,7 +54,7 @@ void SceneObjectList::pushBackForce(SceneObject* obj) void SceneObjectList::pushFront(SceneObject* obj) { - if (find(begin(),end(),obj) == end()) + if (::find(begin(),end(),obj) == end()) push_front(obj); } @@ -62,7 +62,7 @@ void SceneObjectList::pushFront(SceneObject* obj) void SceneObjectList::remove(SceneObject* obj) { - iterator ptr = find(begin(),end(),obj); + iterator ptr = ::find(begin(),end(),obj); if (ptr != end()) erase(ptr); } @@ -71,7 +71,7 @@ void SceneObjectList::remove(SceneObject* obj) void SceneObjectList::removeStable(SceneObject* obj) { - iterator ptr = find(begin(),end(),obj); + iterator ptr = ::find(begin(),end(),obj); if (ptr != end()) erase(ptr); } diff --git a/engine/source/2d/sceneobject/SceneObject_ScriptBinding.h b/engine/source/2d/sceneobject/SceneObject_ScriptBinding.h index e151226da..f01459a12 100755 --- a/engine/source/2d/sceneobject/SceneObject_ScriptBinding.h +++ b/engine/source/2d/sceneobject/SceneObject_ScriptBinding.h @@ -2541,7 +2541,7 @@ ConsoleMethodWithDocs(SceneObject, getCollisionShapeArea, ConsoleFloat, 3, 3, (i if ( shapeIndex >= shapeCount ) { Con::warnf("SceneObject::getCollisionShapeArea() - Invalid shape index of %d.", shapeIndex); - return NULL; + return 0.0f; } // Calculate area if the shape type is circle @@ -3244,12 +3244,12 @@ ConsoleMethodWithDocs( SceneObject, getChainCollisionShapeLocalPoint, ConsoleStr } // Fetch point count. - const U32 pointCount = object->getPolygonCollisionShapePointCount( shapeIndex ); + const U32 pointCount = object->getChainCollisionShapePointCount( shapeIndex ); // Sanity! if ( pointIndex >= pointCount ) { - Con::warnf("SceneObject::getPolygonCollisionShapeLocalPoint() - Invalid point index of %d (only %d available) on shape index of %d.", pointIndex, pointCount, shapeIndex); + Con::warnf("SceneObject::getChainCollisionShapePointCount() - Invalid point index of %d (only %d available) on shape index of %d.", pointIndex, pointCount, shapeIndex); return Vector2::getZero().scriptThis(); } diff --git a/engine/source/2d/sceneobject/SkeletonObject.cc b/engine/source/2d/sceneobject/SkeletonObject.cc index c6a09e007..fa7a0ba58 100644 --- a/engine/source/2d/sceneobject/SkeletonObject.cc +++ b/engine/source/2d/sceneobject/SkeletonObject.cc @@ -88,8 +88,8 @@ void SkeletonObject::initPersistFields() addProtectedField("Asset", TypeSkeletonAssetPtr, Offset(mSkeletonAsset, SkeletonObject), &setSkeletonAsset, &getSkeletonAsset, &writeSkeletonAsset, "The skeleton asset ID used for the skeleton."); addProtectedField("AnimationName", TypeString, Offset(mCurrentAnimation, SkeletonObject), &setAnimationName, &getAnimationName, &writeAnimationName, "The animation name to play."); addProtectedField("Skin", TypeString, Offset(mCurrentSkin, SkeletonObject), &setCurrentSkin, &getCurrentSkin, &writeCurrentSkin, "The skin to use."); - addProtectedField("RootBoneScale", TypeVector2, NULL, &setRootBoneScale, &getRootBoneScale, &writeRootBoneScale, "Scaling of the skeleton's root bone"); - addProtectedField("RootBoneOffset", TypeVector2, NULL, &setRootBoneOffset, &getRootBoneOffset, &writeRootBoneOffset, "X/Y offset of the skeleton's root bone"); + addProtectedField("RootBoneScale", TypeVector2, 0, &setRootBoneScale, &getRootBoneScale, &writeRootBoneScale, "Scaling of the skeleton's root bone"); + addProtectedField("RootBoneOffset", TypeVector2, 0, &setRootBoneOffset, &getRootBoneOffset, &writeRootBoneOffset, "X/Y offset of the skeleton's root bone"); addProtectedField("AnimationCycle", TypeBool, Offset(mAnimationCycle, SkeletonObject), &setAnimationCycle, &defaultProtectedGetFn, &writeAnimationCycle, "Whether the animation loops or not"); addField("FlipX", TypeBool, Offset(mFlipX, SkeletonObject), &writeFlipX, ""); addField("FlipY", TypeBool, Offset(mFlipY, SkeletonObject), &writeFlipY, ""); diff --git a/engine/source/2d/sceneobject/TextSprite.cc b/engine/source/2d/sceneobject/TextSprite.cc index 7ad85c8ce..d30941f73 100644 --- a/engine/source/2d/sceneobject/TextSprite.cc +++ b/engine/source/2d/sceneobject/TextSprite.cc @@ -645,7 +645,7 @@ void TextSprite::CalculateSpatials(F32 ratio) wordEndLength = length - getCursorAdvance(bmChar, prevCharID, ratio); } - if (length > mSize.x && wordEnd > start) + if (length > mSize.x && wordEnd > start && start != -1) { mLine.back().mEnd = wordEnd; U32 endCharID = mText.getChar(wordEnd); diff --git a/engine/source/Box2D/Collision/Shapes/b2ChainShape.h b/engine/source/Box2D/Collision/Shapes/b2ChainShape.h index 6aa41ea41..01bf86f2c 100755 --- a/engine/source/Box2D/Collision/Shapes/b2ChainShape.h +++ b/engine/source/Box2D/Collision/Shapes/b2ChainShape.h @@ -95,8 +95,8 @@ inline b2ChainShape::b2ChainShape() m_radius = b2_polygonRadius; m_vertices = NULL; m_count = 0; - m_hasPrevVertex = NULL; - m_hasNextVertex = NULL; + m_hasPrevVertex = false; + m_hasNextVertex = false; } #endif diff --git a/engine/source/collection/simpleHashTable.h b/engine/source/collection/simpleHashTable.h index 288dcfeee..245cbc51e 100755 --- a/engine/source/collection/simpleHashTable.h +++ b/engine/source/collection/simpleHashTable.h @@ -79,17 +79,17 @@ template class SimpleHashTable : public SparseArray template inline void SimpleHashTable::insert(T* pObject, U8 *key, U32 keyLen) { - Parent::insert(pObject, hash(key, keyLen, 0)); + Parent::insert(pObject, ::hash(key, keyLen, 0)); } template inline T* SimpleHashTable::remove(U8 *key, U32 keyLen) { - return Parent::remove(hash(key, keyLen, 0)); + return Parent::remove(::hash(key, keyLen, 0)); } template inline T* SimpleHashTable::retrieve(U8 *key, U32 keyLen) { - return Parent::retrieve(hash(key, keyLen, 0)); + return Parent::retrieve(::hash(key, keyLen, 0)); } template inline void SimpleHashTable::insert(T* pObject, const char *key) diff --git a/engine/source/console/consoleDoc.cc b/engine/source/console/consoleDoc.cc index 394534b91..b6205ca2b 100755 --- a/engine/source/console/consoleDoc.cc +++ b/engine/source/console/consoleDoc.cc @@ -278,7 +278,7 @@ void Namespace::printNamespaceEntries(Namespace * g, bool dumpScript, bool dumpE } // Finally, see if they did it foo(*) style. - char* func_pos = dStrstr(use, funcName); + const char* func_pos = dStrstr(use, funcName); if((func_pos) && (func_pos < bgn) && (end > bgn)) { U32 len = (U32)(end - bgn - 1); diff --git a/engine/source/console/output_ScriptBinding.h b/engine/source/console/output_ScriptBinding.h index 91475076a..5145ecbd8 100644 --- a/engine/source/console/output_ScriptBinding.h +++ b/engine/source/console/output_ScriptBinding.h @@ -181,7 +181,7 @@ ConsoleFunctionWithDocs(quitWithErrorMessage, ConsoleVoid, 2, 2, (msg string)) ConsoleFunctionWithDocs( gotoWebPage, ConsoleVoid, 2, 2, ( address )) { TORQUE_UNUSED( argc ); - char* protocolSep = dStrstr(argv[1],"://"); + const char* protocolSep = dStrstr(argv[1],"://"); if( protocolSep != NULL ) { diff --git a/engine/source/debug/remote/RemoteDebuggerBase.cc b/engine/source/debug/remote/RemoteDebuggerBase.cc index 9e5aa1c7b..2013167c5 100755 --- a/engine/source/debug/remote/RemoteDebuggerBase.cc +++ b/engine/source/debug/remote/RemoteDebuggerBase.cc @@ -50,7 +50,7 @@ IMPLEMENT_CONOBJECT(RemoteDebuggerBase); //----------------------------------------------------------------------------- RemoteDebuggerBase::RemoteDebuggerBase() : - mClientSocket( InvalidSocket ), + mClientSocket( NetSocket::INVALID ), mClientAuthenticated( false ), mReceiveCommandCursor( 0 ) { @@ -180,7 +180,7 @@ RemoteDebuggerBase* RemoteDebuggerBase::getRemoteDebugger( void ) void RemoteDebuggerBase::processTick( void ) { // Finish if the client socket is invalid. - if ( mClientSocket == InvalidSocket ) + if ( mClientSocket == NetSocket::INVALID ) return; // Calculate read point. @@ -289,7 +289,7 @@ void RemoteDebuggerBase::receiveCommand( const char* pCommand ) bool RemoteDebuggerBase::sendCommand( const char* pCommand ) { // Is the client socket valid? - if ( mClientSocket == InvalidSocket ) + if ( mClientSocket == NetSocket::INVALID ) { // No, so warn. Con::warnf( "Cannot send command with invalid client socket." ); diff --git a/engine/source/debug/remote/RemoteDebuggerBridge.cc b/engine/source/debug/remote/RemoteDebuggerBridge.cc index ce4019aa8..d178714fd 100755 --- a/engine/source/debug/remote/RemoteDebuggerBridge.cc +++ b/engine/source/debug/remote/RemoteDebuggerBridge.cc @@ -48,8 +48,8 @@ static S32 DebuggerVersion = 0; static S32 DebuggerPort = 0; static StringTableEntry DebuggerPassword = NULL; -static NetSocket ServerSocket = InvalidSocket; -static NetSocket ClientSocket = InvalidSocket; +static NetSocket ServerSocket = NetSocket::INVALID; +static NetSocket ClientSocket = NetSocket::INVALID; static RemoteDebuggerBridge::ConnectionState BridgeState = RemoteDebuggerBridge::Closed; //----------------------------------------------------------------------------- @@ -172,15 +172,18 @@ bool RemoteDebuggerBridge::open( const S32 debuggerVersion, const S32 port, cons ServerSocket = Net::openSocket(); // Did we get a valid server socket? - if ( ServerSocket == InvalidSocket ) + if ( ServerSocket == NetSocket::INVALID ) { // No, so warn. Con::warnf( "Could not open a remote debugger server socket. " ); return false; } + NetAddress address; + Net::getIdealListenAddress(&address); + address.port = DebuggerPort; // Start the server listening. - Net::bind( ServerSocket, DebuggerPort ); + Net::bindAddress( address, ServerSocket); Net::listen( ServerSocket, 4 ); Net::setBlocking( ServerSocket, false ); @@ -238,13 +241,13 @@ void RemoteDebuggerBridge::WaitForClientConnection( void ) NetSocket socket = Net::accept( ServerSocket, &address ); // Skip if we don't have a valid socket. - if ( socket == InvalidSocket ) + if ( socket == NetSocket::INVALID) continue; // Info. - Con::printf( "Client connected to remote debugger (port '%d') at %d.%d.%d.%d (port %d).", + Con::printf( "Client connected to remote debugger (port '%d') at %d (port %d).", DebuggerPort, - address.netNum[0], address.netNum[1], address.netNum[2], address.netNum[3], + socket.getHash(), address.port ); // Set client socket. diff --git a/engine/source/debug/telnetDebugger.cc b/engine/source/debug/telnetDebugger.cc index 1f6cfa99b..a6a3e101f 100755 --- a/engine/source/debug/telnetDebugger.cc +++ b/engine/source/debug/telnetDebugger.cc @@ -109,8 +109,8 @@ TelnetDebugger::TelnetDebugger() Con::addConsumer(debuggerConsumer); mAcceptPort = -1; - mAcceptSocket = InvalidSocket; - mDebugSocket = InvalidSocket; + mAcceptSocket = NetSocket::INVALID; + mDebugSocket = NetSocket::INVALID; mState = NotConnected; mCurPos = 0; @@ -147,9 +147,9 @@ TelnetDebugger::~TelnetDebugger() { Con::removeConsumer(debuggerConsumer); - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) Net::closeSocket(mAcceptSocket); - if(mDebugSocket != InvalidSocket) + if(mDebugSocket != NetSocket::INVALID) Net::closeSocket(mDebugSocket); } @@ -168,16 +168,16 @@ void TelnetDebugger::destroy() void TelnetDebugger::send(const char *str) { - if ( mDebugSocket != InvalidSocket ) + if ( mDebugSocket != NetSocket::INVALID ) Net::send(mDebugSocket, (const unsigned char*)str, dStrlen(str)); } void TelnetDebugger::disconnect() { - if ( mDebugSocket != InvalidSocket ) + if ( mDebugSocket != NetSocket::INVALID ) { Net::closeSocket(mDebugSocket); - mDebugSocket = InvalidSocket; + mDebugSocket = NetSocket::INVALID; } removeAllBreakpoints(); @@ -193,16 +193,20 @@ void TelnetDebugger::setDebugParameters(S32 port, const char *password, bool wai // if(port == mAcceptPort) // return; - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) { Net::closeSocket(mAcceptSocket); - mAcceptSocket = InvalidSocket; + mAcceptSocket = NetSocket::INVALID; } mAcceptPort = port; if(mAcceptPort != -1 && mAcceptPort != 0) { + NetAddress address; + Net::getIdealListenAddress(&address); + address.port = mAcceptPort; + mAcceptSocket = Net::openSocket(); - Net::bind(mAcceptSocket, mAcceptPort); + Net::bindAddress(address, mAcceptSocket); Net::listen(mAcceptSocket, 4); Net::setBlocking(mAcceptSocket, false); @@ -236,32 +240,33 @@ void TelnetDebugger::process() { NetAddress address; - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) { // ok, see if we have any new connections: NetSocket newConnection; newConnection = Net::accept(mAcceptSocket, &address); - if(newConnection != InvalidSocket && mDebugSocket == InvalidSocket) + if(newConnection != NetSocket::INVALID && mDebugSocket == NetSocket::INVALID) { - Con::printf ("Debugger connection from %i.%i.%i.%i", - address.netNum[0], address.netNum[1], address.netNum[2], address.netNum[3]); + char buffer[256]; + Net::addressToString(&address, buffer); + Con::printf("Debugger connection from %s", buffer); mState = PasswordTry; mDebugSocket = newConnection; Net::setBlocking(newConnection, false); } - else if(newConnection != InvalidSocket) + else if(newConnection != NetSocket::INVALID) Net::closeSocket(newConnection); } // see if we have any input to process... - if(mDebugSocket == InvalidSocket) + if(mDebugSocket == NetSocket::INVALID) return; checkDebugRecv(); - if(mDebugSocket == InvalidSocket) + if(mDebugSocket == NetSocket::INVALID) removeAllBreakpoints(); } @@ -315,10 +320,7 @@ void TelnetDebugger::checkDebugRecv() } S32 numBytes; - Net::Error err = Net::NotASocket; - - if ( mDebugSocket != InvalidSocket ) - err = Net::recv(mDebugSocket, (unsigned char*)(mLineBuffer + mCurPos), MaxCommandSize - mCurPos, &numBytes); + Net::Error err = Net::recv(mDebugSocket, (unsigned char*)(mLineBuffer + mCurPos), MaxCommandSize - mCurPos, &numBytes); if((err != Net::NoError && err != Net::WouldBlock) || numBytes == 0) { @@ -395,7 +397,7 @@ void TelnetDebugger::breakProcess() { Platform::sleep(10); checkDebugRecv(); - if(mDebugSocket == InvalidSocket) + if(mDebugSocket == NetSocket::INVALID) { mProgramPaused = false; removeAllBreakpoints(); diff --git a/engine/source/delegates/delegateSignal.h b/engine/source/delegates/delegateSignal.h index b94ee9d40..77cb8f2db 100755 --- a/engine/source/delegates/delegateSignal.h +++ b/engine/source/delegates/delegateSignal.h @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _SIGNAL_H_ -#define _SIGNAL_H_ +#ifndef _DELEGATESIGNAL_H_ +#define _DELEGATESIGNAL_H_ #ifndef _UTIL_DELEGATE_H_ #include "delegates/delegate.h" @@ -663,4 +663,4 @@ class Signal : public SignalBaseT& strItem char* tmp = new char[len-1]; dStrncpy(tmp, str, len-1); int perc = dAtoi(tmp); - delete tmp; + delete[] tmp; GridItem gi; gi.IsAbsolute = false; diff --git a/engine/source/gui/editor/guiGraphCtrl.cc b/engine/source/gui/editor/guiGraphCtrl.cc index 89fbd7579..473754006 100755 --- a/engine/source/gui/editor/guiGraphCtrl.cc +++ b/engine/source/gui/editor/guiGraphCtrl.cc @@ -120,10 +120,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect) temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample); GLfloat verts[] = { - getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale), - getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale), - getPosition().x + temp2, getPosition().y + getExtent().y,//may need to switch these last two - getPosition().x + temp1, getPosition().y + getExtent().y, + static_cast(getPosition().x + temp1), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)), + static_cast(getPosition().x + temp2), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)), + static_cast(getPosition().x + temp2), static_cast(getPosition().y + getExtent().y),//may need to switch these last two + static_cast(getPosition().x + temp1), static_cast(getPosition().y + getExtent().y), }; glVertexPointer(2, GL_FLOAT, 0, verts); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); @@ -149,10 +149,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect) temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample); GLfloat verts[] = { - getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale), - getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample+1) * Scale), - getPosition().x + temp2, getPosition().y + getExtent().y,//may need to switch these last two - getPosition().x + temp1, getPosition().y + getExtent().y, + static_cast(getPosition().x + temp1), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)), + static_cast(getPosition().x + temp2), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample+1) * Scale)), + static_cast(getPosition().x + temp2), static_cast(getPosition().y + getExtent().y),//may need to switch these last two + static_cast(getPosition().x + temp1), static_cast(getPosition().y + getExtent().y), }; glVertexPointer(2, GL_FLOAT, 0, verts); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); @@ -170,10 +170,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect) temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample); GLfloat last[] = { - getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale), - getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale), - getPosition().x + temp2, getPosition().y + getExtent().y, - getPosition().x + temp1, getPosition().y + getExtent().y, + static_cast(getPosition().x + temp1), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)), + static_cast(getPosition().x + temp2), static_cast((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)), + static_cast(getPosition().x + temp2), static_cast(getPosition().y + getExtent().y), + static_cast(getPosition().x + temp1), static_cast(getPosition().y + getExtent().y), }; glVertexPointer(2, GL_FLOAT, 0, last); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); @@ -194,7 +194,7 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect) temp = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)0); GLfloat verts[] = { - getPosition().x + temp, getPosition().y + getExtent().y - (S32)(getDatum(k, 0) * Scale), + static_cast(getPosition().x + temp), static_cast(getPosition().y + getExtent().y - (S32)(getDatum(k, 0) * Scale)), 0, 0 }; diff --git a/engine/source/gui/guiCanvas.cc b/engine/source/gui/guiCanvas.cc index f1673dfb1..9cf7dc8a4 100755 --- a/engine/source/gui/guiCanvas.cc +++ b/engine/source/gui/guiCanvas.cc @@ -594,8 +594,12 @@ void GuiCanvas::findMouseControl(const GuiEvent &event) GuiControl *controlHit = findHitControl(event.mousePoint); if(controlHit != static_cast(mMouseControl)) { - if(bool(mMouseControl)) + if (bool(mMouseControl)) + { mMouseControl->onMouseLeave(event); + hoverControlStart = Platform::getRealMilliseconds(); + hoverPositionSet = false; + } mMouseControl = controlHit; mMouseControl->onMouseEnter(event); } diff --git a/engine/source/gui/guiColorPicker.cc b/engine/source/gui/guiColorPicker.cc index 891fc72f1..5b3059236 100755 --- a/engine/source/gui/guiColorPicker.cc +++ b/engine/source/gui/guiColorPicker.cc @@ -103,8 +103,8 @@ void GuiColorPickerCtrl::initPersistFields() #if defined(TORQUE_OS_IOS) || defined(TORQUE_OS_ANDROID) || defined(TORQUE_OS_EMSCRIPTEN) void dglDrawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, ColorF &c3, ColorF &c4) { - S32 left = bounds.point.x, right = bounds.point.x + bounds.extent.x - 1; - S32 top = bounds.point.y, bottom = bounds.point.y + bounds.extent.y - 1; + GLfloat left = bounds.point.x, right = bounds.point.x + bounds.extent.x - 1; + GLfloat top = bounds.point.y, bottom = bounds.point.y + bounds.extent.y - 1; glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -117,10 +117,10 @@ void dglDrawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, ColorF &c3, ColorF & right, bottom, }; const GLubyte squareColors[] = { - 255 * c1.red, 255 * c1.green, 255 * c1.blue, 255 * c1.alpha, - 255 * c2.red, 255 * c2.green, 255 * c2.blue, 255 * c2.alpha, - 255 * c3.red, 255 * c3.green, 255 * c3.blue, 255 * c3.alpha, - 255 * c4.red, 255 * c4.green, 255 * c4.blue, 255 * c4.alpha, + static_cast(255 * c1.red), static_cast(255 * c1.green), static_cast(255 * c1.blue), static_cast(255 * c1.alpha), + static_cast(255 * c2.red), static_cast(255 * c2.green), static_cast(255 * c2.blue), static_cast(255 * c2.alpha), + static_cast(255 * c3.red), static_cast(255 * c3.green), static_cast(255 * c3.blue), static_cast(255 * c3.alpha), + static_cast(255 * c4.red), static_cast(255 * c4.green), static_cast(255 * c4.blue), static_cast(255 * c4.alpha), }; glVertexPointer(2, GL_FLOAT, 0, verts); glEnableClientState(GL_VERTEX_ARRAY); diff --git a/engine/source/gui/guiMessageVectorCtrl.cc b/engine/source/gui/guiMessageVectorCtrl.cc index 2fccc168f..3d5db5cd5 100755 --- a/engine/source/gui/guiMessageVectorCtrl.cc +++ b/engine/source/gui/guiMessageVectorCtrl.cc @@ -302,7 +302,7 @@ void GuiMessageVectorCtrl::createSpecialMarkers(SpecialMarkers& rSpecial, const matchBuffer[499] = '\0'; dStrcat(matchBuffer, "://"); - const char* pMatch = dStrstr(pCurr, (const char*)matchBuffer); + const char* pMatch = dStrstr(pCurr, matchBuffer); if (pMatch != NULL && pMatch < pMinMatch) { pMinMatch = pMatch; minMatchType = i; diff --git a/engine/source/gui/guiTextEditCtrl.cc b/engine/source/gui/guiTextEditCtrl.cc index 72c2b748f..1b6bd1331 100755 --- a/engine/source/gui/guiTextEditCtrl.cc +++ b/engine/source/gui/guiTextEditCtrl.cc @@ -113,7 +113,7 @@ bool GuiTextEditCtrl::onAdd() } } - if( mText && mText[0] ) + if( mText[0] ) { setText(mText); } diff --git a/engine/source/input/actionMap.cc b/engine/source/input/actionMap.cc index 477dc991d..19887ae72 100755 --- a/engine/source/input/actionMap.cc +++ b/engine/source/input/actionMap.cc @@ -310,14 +310,30 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor* while (pModifier != NULL) { if (dStricmp(pModifier, "shift") == 0) { pDescriptor->flags |= SI_SHIFT; + } else if (dStricmp(pModifier, "lshift") == 0) { + pDescriptor->flags |= SI_LSHIFT; + } else if (dStricmp(pModifier, "rshift") == 0) { + pDescriptor->flags |= SI_RSHIFT; } else if (dStricmp(pModifier, "ctrl") == 0) { pDescriptor->flags |= SI_CTRL; + } else if (dStricmp(pModifier, "lctrl") == 0) { + pDescriptor->flags |= SI_LCTRL; + } else if (dStricmp(pModifier, "rctrl") == 0) { + pDescriptor->flags |= SI_RCTRL; } else if (dStricmp(pModifier, "alt") == 0) { pDescriptor->flags |= SI_ALT; + } else if (dStricmp(pModifier, "lalt") == 0) { + pDescriptor->flags |= SI_LALT; + } else if (dStricmp(pModifier, "ralt") == 0) { + pDescriptor->flags |= SI_RALT; } else if (dStricmp(pModifier, "cmd") == 0) { pDescriptor->flags |= SI_ALT; } else if (dStricmp(pModifier, "opt") == 0) { pDescriptor->flags |= SI_MAC_OPT; + } else if (dStricmp(pModifier, "lopt") == 0) { + pDescriptor->flags |= SI_MAC_LOPT; + } else if (dStricmp(pModifier, "ropt") == 0) { + pDescriptor->flags |= SI_MAC_ROPT; } pModifier = dStrtok(NULL, "-"); @@ -528,10 +544,12 @@ const ActionMap::Node* ActionMap::findNode(const U32 inDeviceType, const U32 inD for (i = 0; i < (U32)pDeviceMap->nodeMap.size(); i++) { - if (pDeviceMap->nodeMap[i].action == KEY_ANYKEY && pDeviceMap->nodeMap[i].modifiers == realMods && dIsDecentChar(inAction)) - return &pDeviceMap->nodeMap[i]; - else if (pDeviceMap->nodeMap[i].modifiers == realMods && pDeviceMap->nodeMap[i].action == inAction) - return &pDeviceMap->nodeMap[i]; + if (pDeviceMap->nodeMap[i].action == KEY_ANYKEY && pDeviceMap->nodeMap[i].modifiers == realMods && dIsDecentChar(inAction)) + return &pDeviceMap->nodeMap[i]; + else if (inModifiers == 0 && pDeviceMap->nodeMap[i].modifiers == 0 && pDeviceMap->nodeMap[i].action == inAction) + return &pDeviceMap->nodeMap[i]; + else if (pDeviceMap->nodeMap[i].modifiers == realMods && pDeviceMap->nodeMap[i].action == inAction) + return &pDeviceMap->nodeMap[i]; } return NULL; @@ -794,11 +812,6 @@ bool ActionMap::getDeviceTypeAndInstance(const char *pDeviceName, U32 &deviceTyp deviceType = GamepadDeviceType; offset = dStrlen("gamepad"); } - else if (dStrnicmp(pDeviceName, "leapdevice", dStrlen("leapdevice")) == 0) - { - deviceType = LeapMotionDeviceType; - offset = dStrlen("leapdevice"); - } else return false; @@ -851,10 +864,6 @@ bool ActionMap::getDeviceName(const U32 deviceType, const U32 deviceInstance, ch dSprintf(buffer, 16, "gamepad%d", deviceInstance); break; - case LeapMotionDeviceType: - dStrcpy(buffer, "leapdevice"); - break; - default: Con::errorf( "ActionMap::getDeviceName: unknown device type specified, %d (inst: %d)", deviceType, deviceInstance); return false; @@ -1181,112 +1190,6 @@ bool ActionMap::processBind(const U32 argc, const char** argv, SimObject* object //------------------------------------------------------------------------------ -bool ActionMap::processLeap(const InputEvent* pEvent) -{ - static const char *argv[5]; - char buffer[64]; - - const Node* pNode = findNode( pEvent->deviceType, pEvent->deviceInst, pEvent->modifier, pEvent->objType ); - - if (pNode == NULL) - { - // Check to see if we clear the modifiers, do we find an action? - if (pEvent->modifier != 0) - pNode = findNode(pEvent->deviceType, pEvent->deviceInst, 0, pEvent->objInst); - - if (pNode == NULL) - return false; - } - - // "Do nothing" bind: - if ( !pNode->consoleFunction[0] ) - return( true ); - - argv[0] = pNode->consoleFunction; - - float values[3]; - values[0] = pEvent->fValues[0]; - values[1] = pEvent->fValues[1]; - values[2] = pEvent->fValues[2]; - - if ( pNode->flags & Node::HasDeadZone ) - { - if ( pEvent->fValues[0] >= pNode->deadZoneBegin && pEvent->fValues[0] <= pNode->deadZoneEnd ) - values[0] = 0.0f; - if ( pEvent->fValues[1] >= pNode->deadZoneBegin && pEvent->fValues[1] <= pNode->deadZoneEnd ) - values[1] = 0.0f; - if ( pEvent->fValues[2] >= pNode->deadZoneBegin && pEvent->fValues[2] <= pNode->deadZoneEnd ) - values[2] = 0.0f; - - // All values are all null, so don't bother executing the function - if (!values[0] && !values[1] && !values[2]) - return true; - } - - switch(pEvent->objType) - { - case LM_HANDPOS: - - // ID - argv[1] = Con::getIntArg(pEvent->iValue); - - // Position - dSprintf(buffer, sizeof(buffer), "%f %f %f", values[0], values[1], values[2]); - - argv[2] = buffer; - - if (pNode->object) - Con::executef(pNode->object, 3, argv[0], argv[1], argv[2]); - else - Con::execute(3, argv); - break; - - case LM_HANDROT: - - // ID - argv[1] = Con::getIntArg(pEvent->iValue); - - // Rotation - dSprintf(buffer, sizeof(buffer), "%f %f %f", values[0], values[1], values[2]); - - argv[2] = buffer; - - if (pNode->object) - Con::executef(pNode->object, 3, argv[0], argv[1], argv[2]); - else - Con::execute(3, argv); - break; - - case LM_FINGERPOS: - - // IDs - argv[1] = pEvent->fingerIDs; - - // X-coordinates - argv[2] = pEvent->fingersX; - - // Y-coordinates - argv[3] = pEvent->fingersY; - - // Z-coordinates - argv[4] = pEvent->fingersZ; - - if (pNode->object) - Con::executef(pNode->object, 5, argv[0], argv[1], argv[2], argv[3], argv[4]); - else - Con::execute(5, argv); - break; - - case LM_HANDAXIS: - default: - return false; - } - - return true; -} - -//------------------------------------------------------------------------------ - bool ActionMap::processGesture(const InputEvent* pEvent) { static const char *argv[6]; @@ -1505,10 +1408,21 @@ bool ActionMap::processButton(const InputEvent* pEvent) // after the execs and don't use pNode again. pNode = findNode( pEvent->deviceType, pEvent->deviceInst, pEvent->modifier, pEvent->objInst ); - if( pNode == NULL ) - return true; // We already called any bound methods/functions so our job is done + if (pNode == NULL) + { + if (pEvent->modifier != 0) + { + // Check to see if we clear the modifiers, do we find an action? + pNode = findNode(pEvent->deviceType, pEvent->deviceInst, 0, pEvent->objInst); + + if (pNode == NULL) + { + // We already called any bound methods/functions so our job is done + return true; + } + } + } - // // And enter the break into the table if this is a make event... enterBreakEvent(pEvent, pNode); @@ -1820,9 +1734,6 @@ bool ActionMap::processAction(const InputEvent* pEvent) { switch(pEvent->action) { - case SI_LEAP: - return processLeap(pEvent); - break; case SI_GESTURE: return processGesture(pEvent); break; @@ -2234,13 +2145,6 @@ CodeMapping gVirtualMap[] = { "keyTapGesture", SI_GESTURE, SI_KEYTAP_GESTURE }, { "pinchGesture", SI_GESTURE, SI_PINCH_GESTURE }, { "scaleGesture", SI_GESTURE, SI_SCALE_GESTURE }, - - //-------------------------------------- GESTURE EVENTS - // Preset gesture events: - { "leapHandAxis", SI_LEAP, LM_HANDAXIS }, - { "leapHandPos", SI_LEAP, LM_HANDPOS }, - { "leapHandRot", SI_LEAP, LM_HANDROT }, - { "leapFingerPos", SI_LEAP, LM_FINGERPOS }, //-------------------------------------- MISCELLANEOUS EVENTS // diff --git a/engine/source/input/actionMap.h b/engine/source/input/actionMap.h index 359ebba40..7cca385ba 100755 --- a/engine/source/input/actionMap.h +++ b/engine/source/input/actionMap.h @@ -166,7 +166,6 @@ class ActionMap : public SimObject static const char* buildActionString( const InputEvent* event ); bool processAction(const InputEvent*); - bool processLeap(const InputEvent*); bool processGesture(const InputEvent*); bool processTouch(const InputEvent*); bool processButton(const InputEvent*); diff --git a/engine/source/input/leapMotion/LeapMotionManager_ScriptBinding.h b/engine/source/input/leapMotion/LeapMotionManager_ScriptBinding.h deleted file mode 100644 index 1aeed538c..000000000 --- a/engine/source/input/leapMotion/LeapMotionManager_ScriptBinding.h +++ /dev/null @@ -1,176 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -ConsoleFunction(initLeapMotionManager, void, 1, 1, "() Initialize the LeapMotionManager") -{ - if (gLeapMotionManager != NULL) - { - Con::printf("LeapMotionManager already initialized"); - } - else - { - gLeapMotionManager = new LeapMotionManager(); - } -} - -//----------------------------------------------------------------------------- - -ConsoleFunction(enableLeapMotionManager, void, 2, 2, "(bool enabledState) Run or pause the LeapMotionManager.\n" - "@param enabledState True to turn it on, false otherwise") -{ - if (gLeapMotionManager == NULL) - { - Con::printf("LeapMotionManager not initialized. Call initLeapMotionManager() first"); - } - else - { - gLeapMotionManager->enable(dAtob(argv[1])); - } -} - -//----------------------------------------------------------------------------- - -ConsoleFunction(isLeapMotionManagerEnabled, bool, 1, 1, "() Checks the LeapMotionManager to see if it is enabled.\n" - "@return True if it's running, false otherwise") -{ - if (gLeapMotionManager == NULL) - { - Con::printf("LeapMotionManager not initialized. Call initLeapMotionManager() first"); - return false; - } - else - { - return gLeapMotionManager->getEnabled(); - } -} - -//----------------------------------------------------------------------------- - -ConsoleFunction(enableLeapCursorControl, void, 2, 2, "(bool enabledState) Toggles the manager to act like a mouse.\n" - "@param enabledState True to act like a mouse, false otherwise") -{ - if (gLeapMotionManager == NULL) - { - Con::printf("LeapMotionManager not initialized. Call initLeapMotionManager() first"); - } - else - { - return gLeapMotionManager->toggleMouseControl(dAtob(argv[1])); - } -} - -//----------------------------------------------------------------------------- - -ConsoleFunction(isLeapCursorControlled, bool, 1, 1, "() Checks the LeapMotionManager to see if it is controlling the mouse.\n" - "@return True if it's acting as a mouse, false otherwise") -{ - if (gLeapMotionManager == NULL) - { - Con::printf("LeapMotionManager not initialized. Call initLeapMotionManager() first"); - return false; - } - else - { - return gLeapMotionManager->getMouseControlToggle(); - } -} - -//----------------------------------------------------------------------------- - -ConsoleFunction(configureLeapGesture, bool, 3, 3, "(gestureString, value) Modified a Config string on the main " - "Controller, via the LeapMotionManager. The following strings are allowed:\n" - "Gesture.Circle.MinProgress\n" - "Gesture.Circle.MinRadius\n" - "Gesture.Circle.MinArc\n" - "Gesture.Swipe.MinLength\n" - "Gesture.Swipe.MinVelocity\n" - "Gesture.KeyTap.MinDownVelocity\n" - "Gesture.KeyTap.HistorySeconds\n" - "Gesture.KeyTap.MinDistance\n" - "Gesture.ScreenTap.MinForwardVelocity\n" - "Gesture.ScreenTap.HistorySeconds\n" - "Gesture.ScreenTap.MinDistance\n" - "@param gestureString The Config string to be set\n" - "@param value The new value for the Config string\n" - "@return True if string was successfully set, false otherwise") -{ - if (gLeapMotionManager == NULL) - { - Con::printf("LeapMotionManager not initialized. Call initLeapMotionManager() first"); - return false; - } - else - { - if (!dStrcmp("Gesture.Circle.MinProgress", argv[1])) - { - return gLeapMotionManager->setMinCircleProgress(dAtof(argv[2])); - } - else - { - return gLeapMotionManager->configureLeapGesture(argv[1], dAtof(argv[2])); - } - } -} - -ConsoleFunction(getPointFromProjection, const char*, 2, 4, "(x, y, z) - Gets the closest point on the screen to a point in space using Leap::Screen::project().\n" - "@param x The x component of the finger position.\n" - "@param y The y component of the finger position.\n" - "@param z The z component of the finger position.\n\n" - "@return An \"x y\" position of where the finger intersects with the screen.") -{ - // The new position. - Point3F pos; - - if(argc == 2) - { - dSscanf(argv[1], "%g %g %g", &pos.x, &pos.y, &pos.z); - } - else if (argc == 4) - { - pos.x = dAtof(argv[1]); - pos.y = dAtof(argv[2]); - pos.z = dAtof(argv[3]); - } - else - { - Con::warnf("getPointFromProjection() - Invalid number of parameters!"); - return ""; - } - - return gLeapMotionManager->getPointFromProjection(pos).scriptThis(); - - -} - -ConsoleFunction(getPointFromIntersection, const char*, 2, 2, "(fingerID) - Gets the point of intersection between the screen and a ray " - "projected from a Pointable object using the Screen::intersect() function\n" - "@param fingerID The finger ID, which will be grabbed from the last frame.\n\n" - "@return An \"x y\" position of where the finger intersects with the screen.") -{ - if(argc < 2) - { - Con::warnf("getPointFromIntersection() - Invalid number of parameters!"); - return ""; - } - - return gLeapMotionManager->getPointFromIntersection(dAtoi(argv[1])).scriptThis(); -} \ No newline at end of file diff --git a/engine/source/input/leapMotion/leapMotionManager.cc b/engine/source/input/leapMotion/leapMotionManager.cc deleted file mode 100644 index 51a2795ec..000000000 --- a/engine/source/input/leapMotion/leapMotionManager.cc +++ /dev/null @@ -1,674 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _LEAPMOTIONMANAGER_H_ -#include "input/leapMotion/leapMotionManager.h" -#endif - -#ifndef _PLATFORM_MEMORY_H_ -#include "platform/platformMemory.h" -#endif - -#ifndef _CONSOLETYPES_H_ -#include "console/consoleTypes.h" -#endif - -#ifndef _EVENT_H_ -#include "platform/event.h" -#endif - -#ifndef _GAMEINTERFACE_H_ -#include "game/gameInterface.h" -#endif - -#ifndef _GUICANVAS_H_ -#include "gui/guiCanvas.h" -#endif - -#ifndef _LEAPMOTIONUTIL_H_ -#include "leapMotionUtil.h" -#endif - -#ifndef _VECTOR2_H_ -#include "2d/core/Vector2.h" -#endif - -#include "input/leapMotion/LeapMotionManager_ScriptBinding.h" - -//----------------------------------------------------------------------------- - -bool LeapMotionManager::smEnableDevice = true; - -bool LeapMotionManager::smGenerateIndividualEvents = true; -bool LeapMotionManager::smKeepHandIndexPersistent = false; -bool LeapMotionManager::smKeepPointableIndexPersistent = false; - -bool LeapMotionManager::smGenerateSingleHandRotationAsAxisEvents = false; - -F32 LeapMotionManager::smMaximumHandAxisAngle = 25.0f; - -bool LeapMotionManager::smGenerateWholeFrameEvents = false; - -U32 LeapMotionManager::LM_FRAMEVALIDDATA = 0; -U32 LeapMotionManager::LM_HAND[LeapMotionConstants::MaxHands] = {0}; -//U32 LeapMotionManager::LM_HANDROT[LeapMotionConstants::MaxHands] = {0}; -U32 LeapMotionManager::LM_HANDAXISX = 0; -U32 LeapMotionManager::LM_HANDAXISY = 0; -U32 LeapMotionManager::LM_HANDPOINTABLE[LeapMotionConstants::MaxHands][LeapMotionConstants::MaxPointablesPerHand] = {0}; -U32 LeapMotionManager::LM_HANDPOINTABLEROT[LeapMotionConstants::MaxHands][LeapMotionConstants::MaxPointablesPerHand] = {0}; -U32 LeapMotionManager::LM_FRAME = 0; - -//----------------------------------------------------------------------------- - -LeapMotionManager::LeapMotionManager() -{ - // Initialize the console variables - staticInit(); - - // Create our controller and listener - mListener = new MotionListener(); - mController = new Leap::Controller(); - mController->addListener(*mListener); - - // Allocate a mutex to use later - mActiveMutex = Mutex::createMutex(); - - // Nothing is ready yet - mEnabled = false; - mActive = false; - mMouseControl = false; - mMinCircleProgress = 0.0; -} - -//----------------------------------------------------------------------------- - -LeapMotionManager::~LeapMotionManager() -{ - // Disable and delete internal members - disable(); - - // Get rid of the mutex - Mutex::destroyMutex(mActiveMutex); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::staticInit() -{ - // If true, the Leap Motion device will be enabled, if present - Con::addVariable("pref::LeapMotion::EnableDevice", TypeBool, &smEnableDevice); - - // Indicates that events for each hand and pointable will be created. - Con::addVariable("LeapMotion::GenerateIndividualEvents", TypeBool, &smGenerateIndividualEvents); - - // Indicates that we track hand IDs and will ensure that the same hand will remain at the same index between frames. - Con::addVariable("LeapMotion::KeepHandIndexPersistent", TypeBool, &smKeepHandIndexPersistent); - - // Indicates that we track pointable IDs and will ensure that the same pointable will remain at the same index between frames. - Con::addVariable("LeapMotion::KeepPointableIndexPersistent", TypeBool, &smKeepPointableIndexPersistent); - - // If true, broadcast single hand rotation as axis events. - Con::addVariable("LeapMotion::GenerateSingleHandRotationAsAxisEvents", TypeBool, &smGenerateSingleHandRotationAsAxisEvents); - - // The maximum hand angle when used as an axis event as measured from a vector pointing straight up (in degrees). - // Shoud range from 0 to 90 degrees. - Con::addVariable("LeapMotion::MaximumHandAxisAngle", TypeF32, &smMaximumHandAxisAngle); - - // Indicates that a whole frame event should be generated and frames should be buffered. - Con::addVariable("LeapMotion::GenerateWholeFrameEvents", TypeBool, &smGenerateWholeFrameEvents); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::enable(bool enabledState) -{ - Mutex::lockMutex(mActiveMutex); - mEnabled = enabledState; - Mutex::unlockMutex(mActiveMutex); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::disable() -{ - if (mController) - { - delete mController; - mController = NULL; - - if (mListener) - { - delete mListener; - mListener = NULL; - } - } - - setActive(false); - mEnabled = false; -} - -//----------------------------------------------------------------------------- - -bool LeapMotionManager::getActive() -{ - Mutex::lockMutex(mActiveMutex); - bool active = mActive; - Mutex::unlockMutex(mActiveMutex); - - return active; -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::setActive(bool state) -{ - Mutex::lockMutex(mActiveMutex); - mActive = state; - Mutex::unlockMutex(mActiveMutex); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::toggleMouseControl(bool enabledState) -{ - Mutex::lockMutex(mActiveMutex); - mMouseControl = enabledState; - Mutex::unlockMutex(mActiveMutex); -} - -//----------------------------------------------------------------------------- - -bool LeapMotionManager::getMouseControlToggle() -{ - Mutex::lockMutex(mActiveMutex); - bool mouseControlled = mMouseControl; - Mutex::unlockMutex(mActiveMutex); - - return mouseControlled; -} - -//----------------------------------------------------------------------------- -// You can get and set gesture configuration parameters using the Config object -// obtained from a connected Controller object. The key strings required to -// * identify a configuration parameter include: -//* -//* Key string | Value type | Default value | Units -//* -----------|------------|---------------|------ -//* Gesture.Circle.MinRadius | float | 5.0 | mm -//* Gesture.Circle.MinArc | float | 1.5 | radians -//* Gesture.Swipe.MinLength | float | 150 | mm -//* Gesture.Swipe.MinVelocity | float | 1000 | mm/s -//* Gesture.KeyTap.MinDownVelocity | float | 50 | mm/s -//* Gesture.KeyTap.HistorySeconds | float | 0.1 | s -//* Gesture.KeyTap.MinDistance | float | 3.0 | mm -//* Gesture.ScreenTap.MinForwardVelocity | float | 50 | mm/s -//* Gesture.ScreenTap.HistorySeconds | float | 0.1 | s -//* Gesture.ScreenTap.MinDistance | float | 5.0 | mm -bool LeapMotionManager::configureLeapGesture(const char* configString, const F32 value) -{ - // Get this controller's config. - Leap::Config config = mController->config(); - - // Convert and pass the key, along with the value. - std::string *keyString = new std::string(configString); - bool success = config.setFloat(*keyString, value); - - // Free memory and return the result. - delete keyString; - return success; -} - -//----------------------------------------------------------------------------- - -bool LeapMotionManager::setMinCircleProgress(const F32 value) -{ - mMinCircleProgress = value; - return true; -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::processHand(const Leap::Hand& hand, S32 id) -{ - // Get hand (palm) position - /*Point3F rawHandPosition; - Point3I convertedHandPosition; - - LeapMotionUtil::convertPosition(hand.palmPosition(), rawHandPosition); - convertedHandPosition.x = (S32)mFloor(rawHandPosition.x); - convertedHandPosition.y = (S32)mFloor(rawHandPosition.y); - convertedHandPosition.z = (S32)mFloor(rawHandPosition.z);*/ - - // Get the hand's normal vector and direction - const Leap::Vector normal = hand.palmNormal(); - const Leap::Vector direction = hand.direction(); - - F32 pitch = direction.pitch() * Leap::RAD_TO_DEG; - F32 roll = normal.roll() * Leap::RAD_TO_DEG; - F32 yaw = direction.yaw() * Leap::RAD_TO_DEG; - - // Position Event - InputEvent handPosEvent; - - handPosEvent.deviceInst = 0; - handPosEvent.iValue = id; - handPosEvent.fValues[0] = hand.palmPosition().x; - handPosEvent.fValues[1] = hand.palmPosition().y; - handPosEvent.fValues[2] = hand.palmPosition().z; - handPosEvent.deviceType = LeapMotionDeviceType; - handPosEvent.objType = LM_HANDPOS; - handPosEvent.objInst = 0; - handPosEvent.action = SI_LEAP; - handPosEvent.modifier = 0; - - InputEvent handRotEvent; - - handRotEvent.deviceInst = 0; - handRotEvent.iValue = id; - handRotEvent.fValues[0] = yaw; - handRotEvent.fValues[1] = pitch; - handRotEvent.fValues[2] = roll; - handRotEvent.objType = LM_HANDROT; - handRotEvent.deviceType = LeapMotionDeviceType; - handRotEvent.objInst = 0; - handRotEvent.action = SI_LEAP; - handRotEvent.modifier = 0; - - Game->postEvent(handPosEvent); - Game->postEvent(handRotEvent); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::processHandPointables(const Leap::PointableList& pointables) -{ - InputEvent pointablePositionEvent; - pointablePositionEvent.deviceInst = 0; - pointablePositionEvent.objInst = 0; - pointablePositionEvent.modifier = 0; - pointablePositionEvent.deviceType = LeapMotionDeviceType; - pointablePositionEvent.objType = LM_FINGERPOS; - pointablePositionEvent.action = SI_LEAP; - - for (int f = 0; f < pointables.count(); ++f) - { - Leap::Pointable pointable = pointables[f]; - - char charHolder[10]; - Leap::Vector tipPosition = pointables[f].tipPosition(); - - dItoa((S32)tipPosition.x, charHolder); - dStrcat(pointablePositionEvent.fingersX, charHolder); - dStrcat(pointablePositionEvent.fingersX, " "); - - dItoa((S32)tipPosition.y, charHolder); - dStrcat(pointablePositionEvent.fingersY, charHolder); - dStrcat(pointablePositionEvent.fingersY, " "); - - dItoa((S32)tipPosition.z, charHolder); - dStrcat(pointablePositionEvent.fingersZ, charHolder); - dStrcat(pointablePositionEvent.fingersZ, " "); - - dItoa(pointables[f].id(), charHolder); - dStrcat(pointablePositionEvent.fingerIDs, charHolder); - dStrcat(pointablePositionEvent.fingerIDs, " "); - } - - // Post - Game->postEvent(pointablePositionEvent); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::processGestures(const Leap::GestureList& gestures) -{ - for (int g = 0; g < gestures.count(); ++g) - { - Leap::Gesture gesture = gestures[g]; - - switch (gesture.type()) - { - case Leap::Gesture::TYPE_CIRCLE: - { - Leap::CircleGesture circle = gesture; - - if (circle.progress() < mMinCircleProgress) - break; - - bool clockWise; - - if (circle.pointable().direction().angleTo(circle.normal()) <= Leap::PI/4) - clockWise = true; - else - clockWise = false; - - InputEvent event; - - event.deviceInst = 0; - event.iValue = g; - event.fValues[0] = circle.progress(); - event.fValues[1] = circle.radius(); - event.fValues[2] = clockWise; - event.fValues[3] = (F32)circle.state(); - event.deviceType = LeapMotionDeviceType; - event.objType = SI_CIRCLE_GESTURE; - event.objInst = 0; - event.action = SI_GESTURE; - event.modifier = 0; - - Game->postEvent(event); - break; - } - case Leap::Gesture::TYPE_SWIPE: - { - Leap::SwipeGesture swipe = gesture; - - // Comment to post begin and update swipes - if (swipe.state() != Leap::Gesture::STATE_STOP) - { - break; - } - - InputEvent event; - - event.deviceInst = 0; - event.iValue = g; - event.fValues[0] = (F32)swipe.state(); - event.fValues[1] = swipe.direction().x; - event.fValues[2] = swipe.direction().y; - event.fValues[3] = swipe.direction().z; - event.fValues[4] = swipe.speed(); - event.deviceType = LeapMotionDeviceType; - event.objType = SI_SWIPE_GESTURE; - event.objInst = 0; - event.action = SI_GESTURE; - event.modifier = 0; - - Game->postEvent(event); - break; - } - case Leap::Gesture::TYPE_KEY_TAP: - { - Leap::KeyTapGesture tap = gesture; - - InputEvent event; - - event.deviceInst = 0; - event.iValue = g; - event.fValues[0] = tap.position().x; - event.fValues[1] = tap.position().y; - event.fValues[2] = tap.position().z; - event.fValues[3] = tap.direction().x; - event.fValues[4] = tap.direction().y; - event.fValues[5] = tap.direction().z; - event.deviceType = LeapMotionDeviceType; - event.objType = SI_KEYTAP_GESTURE; - event.objInst = 0; - event.action = SI_GESTURE; - event.modifier = 0; - - Game->postEvent(event); - break; - } - case Leap::Gesture::TYPE_SCREEN_TAP: - { - Leap::ScreenTapGesture screentap = gesture; - - InputEvent event; - - event.deviceInst = 0; - event.iValue = g; - event.fValues[0] = screentap.position().x; - event.fValues[1] = screentap.position().y; - event.fValues[2] = screentap.position().z; - event.fValues[3] = screentap.direction().x; - event.fValues[4] = screentap.direction().y; - event.fValues[5] = screentap.direction().z; - event.deviceType = LeapMotionDeviceType; - event.objType = SI_SCREENTAP_GESTURE; - event.objInst = 0; - event.action = SI_GESTURE; - event.modifier = 0; - - Game->postEvent(event); - break; - } - default: - Con::warnf("LeapMotionManager::process() - Unknown gesture detected"); - break; - } - } -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::process(const Leap::Controller& controller) -{ - // Is the manager enabled? - if (!mEnabled) - return; - - // Was the leap device activated - if (!getActive()) - return; - - // Get the current frame - const Leap::Frame frame = controller.frame(); - - if (!frame.isValid()) - return; - - mLastFrame = frame; - - // Get gestures - const Leap::GestureList gestures = frame.gestures(); - - if (!gestures.isEmpty()) - processGestures(gestures); - - if (getMouseControlToggle()) - { - generateMouseEvent(controller); - return; - } - - // Is a hand present? - if ( !frame.hands().isEmpty() ) - { - for (int h = 0; h < frame.hands().count(); ++h) - { - const Leap::Hand hand = frame.hands()[h]; - - processHand(hand, h); - - } - } - - if (frame.pointables().count()) - { - const Leap::PointableList pointables = frame.pointables(); - - if (pointables.count()) - processHandPointables(pointables); - } -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::generateMouseEvent(Leap::Controller const & controller) -{ - - const Leap::ScreenList screens = controller.locatedScreens(); - - // make sure we have a detected screen - if (screens.isEmpty()) - return; - - const Leap::Screen screen = screens[0]; - - // find the first finger or tool - const Leap::Frame frame = controller.frame(); - const Leap::HandList hands = frame.hands(); - - if (hands.isEmpty()) - return; - - const Leap::PointableList pointables = hands[0].pointables(); - - if (pointables.isEmpty()) - return; - - const Leap::Pointable firstPointable = pointables[0]; - - // get x, y coordinates on the first screen - const Leap::Vector intersection = screen.intersect( firstPointable, true, 1.0f ); - - // if the user is not pointing at the screen all components of - // the returned vector will be Not A Number (NaN) - // isValid() returns true only if all components are finite - if (!intersection.isValid()) - return; - - F32 x = screen.widthPixels() * intersection.x; - - // flip y coordinate to standard top-left origin - F32 y = screen.heightPixels() * (1.0f - intersection.y); - - // Move the cursor - Point2I location((S32)x, (S32)y); - Canvas->setCursorPos(location); - - // Build and postthe mouse event - MouseMoveEvent TorqueEvent; - TorqueEvent.xPos = (S32) location.x; - TorqueEvent.yPos = (S32) location.y; - Game->postEvent(TorqueEvent); -} - -//----------------------------------------------------------------------------- - -Vector2 LeapMotionManager::getPointFromProjection(Point3F position) -{ - // Get the screen and projection - const Leap::Vector pointablePosition(position.x, position.y, position.z); - const Leap::Screen screen = mController->locatedScreens()[0]; - const Leap::Vector projectedPosition = screen.project(pointablePosition, true, 1.0f); - - // if the user is not pointing at the screen all components of - // the returned vector will be Not A Number (NaN) - // isValid() returns true only if all components are finite - if (!projectedPosition.isValid()) - return Vector2(""); - - // Get the screen coordinates - F32 x = screen.widthPixels() * projectedPosition.x; - - // flip y coordinate to standard top-left origin - F32 y = screen.heightPixels() * (1.0f - projectedPosition.y); - - // Build the screenPosition and return it - Vector2 screenPosition; - screenPosition.x = x; - screenPosition.y = y; - - return screenPosition; -} - -//----------------------------------------------------------------------------- - -Vector2 LeapMotionManager::getPointFromIntersection(S32 pointableID) -{ - // Get the finger via ID and check for validity - Leap::Pointable lastPointable = mLastFrame.pointable(pointableID); - - if (!lastPointable.isValid()) - return Vector2(""); - - // Get the screen and intersection - const Leap::Screen screen = mController->locatedScreens()[0]; - const Leap::Vector intersection = screen.intersect( lastPointable, true, 1.0f ); - - // if the user is not pointing at the screen all components of - // the returned vector will be Not A Number (NaN) - // isValid() returns true only if all components are finite - if (!intersection.isValid()) - return Vector2(""); - - // Get the screen coordinates - F32 x = screen.widthPixels() * intersection.x; - - // flip y coordinate to standard top-left origin - F32 y = screen.heightPixels() * (1.0f - intersection.y); - - // Build the screenPosition and return it - Vector2 screenPosition; - screenPosition.x = x; - screenPosition.y = y; - - return screenPosition; -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onInit(const Leap::Controller& controller) -{ - //Con::printf("MotionListener::onInit()"); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onFrame(const Leap::Controller& controller) -{ - gLeapMotionManager->process(controller); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onConnect(const Leap::Controller& controller) -{ - gLeapMotionManager->setActive(true); - controller.enableGesture(Leap::Gesture::TYPE_CIRCLE); - controller.enableGesture(Leap::Gesture::TYPE_KEY_TAP); - controller.enableGesture(Leap::Gesture::TYPE_SCREEN_TAP); - controller.enableGesture(Leap::Gesture::TYPE_SWIPE); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onDisconnect (const Leap::Controller& controller) -{ - gLeapMotionManager->setActive(false); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onFocusGained(const Leap::Controller& controller) -{ - gLeapMotionManager->setActive(true); -} - -//----------------------------------------------------------------------------- - -void LeapMotionManager::MotionListener::onFocusLost(const Leap::Controller& controller) -{ - gLeapMotionManager->setActive(false); -} \ No newline at end of file diff --git a/engine/source/input/leapMotion/leapMotionManager.h b/engine/source/input/leapMotion/leapMotionManager.h deleted file mode 100644 index 5a68abf20..000000000 --- a/engine/source/input/leapMotion/leapMotionManager.h +++ /dev/null @@ -1,162 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- -#ifndef _LEAPMOTIONMANAGER_H_ -#define _LEAPMOTIONMANAGER_H_ - -#ifndef _UTILITY_H_ -#include "2d/core/Utility.h" -#endif - -#ifndef _LEAPMOTIONCONSTANTS_H_ -#include "input/leapMotion/leapMotionConstants.h" -#endif - -#ifndef __Leap_h__ -#include "Leap.h" -#endif - - -class LeapMotionManager -{ -protected: - - bool mEnabled; - F32 mMinCircleProgress; - - struct FingerEvent - { - S32 id; - F32 x; - F32 y; - F32 z; - - FingerEvent( S32 ID, F32 X, F32 Y, F32 Z) - { - id = ID; - x = X; - y = Y; - z = Z; - } - }; - - class MotionListener : public Leap::Listener - { - public: - MotionListener() {} - virtual ~MotionListener() {} - - virtual void onConnect (const Leap::Controller& controller); - virtual void onDisconnect (const Leap::Controller& controller); - virtual void onInit(const Leap::Controller& controller); - virtual void onFrame(const Leap::Controller& controller); - virtual void onFocusGained(const Leap::Controller& controller); - virtual void onFocusLost(const Leap::Controller& controller); - }; - - /// The connection to the Leap Motion - Leap::Controller* mController; - - /// Our Leap Motion listener class - MotionListener* mListener; - - /// Used with the LM listener object - void* mActiveMutex; - - /// Is the Leap Motion active - bool mActive; - - /// Is the Manager acting like a mouse - bool mMouseControl; - - /// Last stored frame - Leap::Frame mLastFrame; - -public: - static bool smEnableDevice; - - // Indicates that events for each hand and pointable will be created - static bool smGenerateIndividualEvents; - - // Indicates that we track hand IDs and will ensure that the same hand - // will remain at the same index between frames. - static bool smKeepHandIndexPersistent; - - // Indicates that we track pointable IDs and will ensure that the same - // pointable will remain at the same index between frames. - static bool smKeepPointableIndexPersistent; - - // Broadcast single hand rotation as axis - static bool smGenerateSingleHandRotationAsAxisEvents; - - // The maximum hand angle when used as an axis event - // as measured from a vector pointing straight up (in degrees) - static F32 smMaximumHandAxisAngle; - - // Indicates that a whole frame event should be generated and frames - // should be buffered. - static bool smGenerateWholeFrameEvents; - - // Frame action codes - static U32 LM_FRAMEVALIDDATA; // SI_BUTTON - - // Hand action codes - static U32 LM_HAND[LeapMotionConstants::MaxHands]; // SI_POS - //static U32 LM_HANDROT[LeapMotionConstants::MaxHands]; // SI_ROT - - static U32 LM_HANDAXISX; // SI_AXIS - static U32 LM_HANDAXISY; - - // Pointables action codes - static U32 LM_HANDPOINTABLE[LeapMotionConstants::MaxHands][LeapMotionConstants::MaxPointablesPerHand]; // SI_POS - static U32 LM_HANDPOINTABLEROT[LeapMotionConstants::MaxHands][LeapMotionConstants::MaxPointablesPerHand]; // SI_ROT - - // Whole frame - static U32 LM_FRAME; // SI_INT - -public: - LeapMotionManager(); - ~LeapMotionManager(); - - static void staticInit(); - - void enable(bool enabledState); - void disable(); - bool getEnabled() { return mEnabled; } - bool getActive(); - void setActive(bool enabledState); - void toggleMouseControl(bool enabledState); - bool getMouseControlToggle(); - bool setMinCircleProgress(const F32 value); - F32 getMinCircleProgress() { return mMinCircleProgress; } - bool configureLeapGesture(const char* configString, const F32 value); - void process(const Leap::Controller& controller); - void processHand(const Leap::Hand& hand, S32 id); - void processHandPointables(const Leap::PointableList& pointables); - void processGestures(const Leap::GestureList& gestures); - void generateMouseEvent(const Leap::Controller& controller); - Vector2 getPointFromProjection(Point3F position); - Vector2 getPointFromIntersection(S32 pointableID); -}; - -static LeapMotionManager* gLeapMotionManager; - -#endif \ No newline at end of file diff --git a/engine/source/input/leapMotion/leapMotionUtil.cpp b/engine/source/input/leapMotion/leapMotionUtil.cpp deleted file mode 100644 index a618a22d4..000000000 --- a/engine/source/input/leapMotion/leapMotionUtil.cpp +++ /dev/null @@ -1,109 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "input/leapMotion/leapMotionUtil.h" - -namespace LeapMotionUtil -{ - -void convertPosition(const Leap::Vector& inPosition, F32& x, F32& y, F32& z) -{ - // Convert to Torque coordinates. The conversion is: - // - // Motion Torque - // x y z --> x -z y - x = inPosition.x; // x = x - y = -inPosition.z; // y = -z - z = inPosition.y; // z = y; -} - -void convertPosition(const Leap::Vector& inPosition, Point3F& outPosition) -{ - // Convert to Torque coordinates. The conversion is: - // - // Motion Torque - // x y z --> x -z y - outPosition.x = inPosition.x; // x = x - outPosition.y = -inPosition.z; // y = -z - outPosition.z = inPosition.y; // z = y; -} - -void convertHandRotation(const Leap::Hand& hand, MatrixF& outRotation) -{ - // We need to convert from Motion coordinates to - // Torque coordinates. The conversion is: - // - // Motion Torque - // a b c a b c a -c b - // d e f --> -g -h -i --> -g i -h - // g h i d e f d -f e - const Leap::Vector& handToFingers = hand.direction(); - Leap::Vector handFront = -handToFingers; - const Leap::Vector& handDown = hand.palmNormal(); - Leap::Vector handUp = -handDown; - Leap::Vector handRight = handUp.cross(handFront); - - outRotation.setColumn(0, Point4F( handRight.x, -handRight.z, handRight.y, 0.0f)); - outRotation.setColumn(1, Point4F( -handFront.x, handFront.z, -handFront.y, 0.0f)); - outRotation.setColumn(2, Point4F( handUp.x, -handUp.z, handUp.y, 0.0f)); - outRotation.setPosition(Point3F::Zero); -} - -void calculateHandAxisRotation(const MatrixF& handRotation, const F32& maxHandAxisRadius, Point2F& outRotation) -{ - const VectorF& controllerUp = handRotation.getUpVector(); - outRotation.x = controllerUp.x; - outRotation.y = controllerUp.y; - - // Limit the axis angle to that given to us - if (outRotation.len() > maxHandAxisRadius) - { - outRotation.normalize(maxHandAxisRadius); - } - - // Renormalize to the range of 0..1 - if (maxHandAxisRadius != 0.0f) - { - outRotation /= maxHandAxisRadius; - } -} - -void convertPointableRotation(const Leap::Pointable& pointable, MatrixF& outRotation) -{ - // We need to convert from Motion coordinates to - // Torque coordinates. The conversion is: - // - // Motion Torque - // a b c a b c a -c b - // d e f --> -g -h -i --> -g i -h - // g h i d e f d -f e - Leap::Vector pointableFront = -pointable.direction(); - Leap::Vector pointableRight = Leap::Vector::up().cross(pointableFront); - Leap::Vector pointableUp = pointableFront.cross(pointableRight); - - outRotation.setColumn(0, Point4F( pointableRight.x, -pointableRight.z, pointableRight.y, 0.0f)); - outRotation.setColumn(1, Point4F( -pointableFront.x, pointableFront.z, -pointableFront.y, 0.0f)); - outRotation.setColumn(2, Point4F( pointableUp.x, -pointableUp.z, pointableUp.y, 0.0f)); - outRotation.setPosition(Point3F::Zero); -} - -} diff --git a/engine/source/io/byteBuffer.cpp b/engine/source/io/byteBuffer.cpp new file mode 100644 index 000000000..728b12286 --- /dev/null +++ b/engine/source/io/byteBuffer.cpp @@ -0,0 +1,159 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#include "io/byteBuffer.h" +#include "math/mMathFn.h" + + +namespace Torque +{ + +class PrivateBBData +{ +public: + PrivateBBData() + : refCount( 1 ), + dataSize( 0 ), + data( NULL ) + { + } + + U32 refCount; ///< Reference count + U32 dataSize; ///< Length of buffer + U8 *data; ///< Our data buffer +}; + +//-------------------------------------- + +ByteBuffer::ByteBuffer() +{ + _data = new PrivateBBData; + _data->dataSize = 0; + _data->data = NULL; +} + +ByteBuffer::ByteBuffer(U8 *dataPtr, U32 bufferSize) +{ + _data = new PrivateBBData; + _data->dataSize = bufferSize; + _data->data = new U8[bufferSize]; + + dMemcpy( _data->data, dataPtr, bufferSize ); +} + +ByteBuffer::ByteBuffer(U32 bufferSize) +{ + _data = new PrivateBBData; + _data->dataSize = bufferSize; + _data->data = new U8[bufferSize]; +} + +ByteBuffer::ByteBuffer(const ByteBuffer &theBuffer) +{ + _data = theBuffer._data; + _data->refCount++; +} + +ByteBuffer &ByteBuffer::operator=(const ByteBuffer &theBuffer) +{ + _data = theBuffer._data; + _data->refCount++; + + return *this; +} + +ByteBuffer::~ByteBuffer() +{ + if (!--_data->refCount) + { + delete [] _data->data; + delete _data; + + _data = NULL; + } +} + +void ByteBuffer::setBuffer(U8 *dataPtr, U32 bufferSize, bool copyData) +{ + U8 *newData = dataPtr; + + if ( copyData ) + { + newData = new U8[bufferSize]; + + dMemcpy( newData, dataPtr, bufferSize ); + } + + delete [] _data->data; + + _data->data = newData; + _data->dataSize = bufferSize; +} + +void ByteBuffer::resize(U32 newBufferSize) +{ + U8 *newData = new U8[newBufferSize]; + + U32 copyLen = getMin( newBufferSize, _data->dataSize ); + + dMemcpy( newData, _data->data, copyLen ); + + delete [] _data->data; + + _data->data = newData; + _data->dataSize = newBufferSize; +} + +void ByteBuffer::appendBuffer(const U8 *dataBuffer, U32 bufferSize) +{ + U32 start = _data->dataSize; + resize(start + bufferSize); + dMemcpy(_data->data + start, dataBuffer, bufferSize); +} + +U32 ByteBuffer::getBufferSize() const +{ + return _data->dataSize; +} + +U8 *ByteBuffer::getBuffer() +{ + return _data->data; +} + +const U8 *ByteBuffer::getBuffer() const +{ + return _data->data; +} + +ByteBuffer ByteBuffer::getCopy() const +{ + return ByteBuffer( _data->data, _data->dataSize ); +} + +void ByteBuffer::clear() +{ + dMemset(_data->data, 0, _data->dataSize); +} + + +} diff --git a/engine/source/io/byteBuffer.h b/engine/source/io/byteBuffer.h new file mode 100644 index 000000000..79751aad0 --- /dev/null +++ b/engine/source/io/byteBuffer.h @@ -0,0 +1,85 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _BYTEBUFFER_H_ +#define _BYTEBUFFER_H_ + +#ifndef _PLATFORM_H_ +#include "platform/platform.h" +#endif + +namespace Torque +{ + +class PrivateBBData; + +class ByteBuffer +{ +public: + ByteBuffer(); + + /// Create a ByteBuffer from a chunk of memory. + ByteBuffer(U8 *dataPtr, U32 bufferSize); + + /// Create a ByteBuffer of the specified size. + ByteBuffer(U32 bufferSize); + + /// Copy constructor + ByteBuffer(const ByteBuffer &theBuffer); + + ByteBuffer &operator=(const ByteBuffer &theBuffer); + + ~ByteBuffer(); + + /// Set the ByteBuffer to point to a new chunk of memory. + void setBuffer(U8 *dataPtr, U32 bufferSize, bool copyData); + + /// Resize the buffer. + void resize(U32 newBufferSize); + + /// Appends the specified buffer to the end of the byte buffer. + void appendBuffer(const U8 *dataBuffer, U32 bufferSize); + + /// Appends the specified ByteBuffer to the end of this byte buffer. + void appendBuffer(const ByteBuffer &theBuffer) + { + appendBuffer(theBuffer.getBuffer(), theBuffer.getBufferSize()); + } + + U32 getBufferSize() const; + + U8 *getBuffer(); + const U8 *getBuffer() const; + + /// Copy the data in the buffer. + ByteBuffer getCopy() const; + + /// Clear the buffer. + void clear(); + +private: + PrivateBBData *_data; +}; + +} + +#endif diff --git a/engine/source/io/fileObject.cc b/engine/source/io/fileObject.cc index fae9063c5..e00608e5e 100755 --- a/engine/source/io/fileObject.cc +++ b/engine/source/io/fileObject.cc @@ -58,7 +58,7 @@ bool FileObject::openForWrite(const char *fileName, const bool append) close(); - if(buffer == NULL || *buffer == 0) + if(*buffer == 0) return false; if ( !append ) diff --git a/engine/source/io/fileSystem_ScriptBinding.cc b/engine/source/io/fileSystem_ScriptBinding.cc index 9b93ab08a..1cd744df0 100755 --- a/engine/source/io/fileSystem_ScriptBinding.cc +++ b/engine/source/io/fileSystem_ScriptBinding.cc @@ -240,7 +240,7 @@ ConsoleFunctionWithDocs(isWriteableFileName, ConsoleBool, 2, 2, (fileName)) char filename[1024]; Con::expandPath(filename, sizeof(filename), argv[1]); - if (filename == NULL || *filename == 0) + if (*filename == 0) return false; // in a writeable directory? diff --git a/engine/source/io/nStream.cc b/engine/source/io/nStream.cc index 9b737ae84..5753b14c6 100755 --- a/engine/source/io/nStream.cc +++ b/engine/source/io/nStream.cc @@ -24,6 +24,8 @@ #include "stream.h" #include "string/stringTable.h" #include "graphics/color.h" +#include "io/rawData.h" +#include "io/byteBuffer.h" #ifndef _INC_STDARG #include @@ -201,6 +203,35 @@ bool Stream::read(ColorF* pColor) return success; } +bool Stream::write(const NetAddress &na) +{ + bool success = write(na.type); + success &= write(na.port); + success &= write(sizeof(na.address), &na.address); + return success; +} + +bool Stream::read(NetAddress *na) +{ + bool success = read(&na->type); + success &= read(&na->port); + success &= read(sizeof(na->address), &na->address); + return success; +} + +bool Stream::write(const NetSocket &so) +{ + return write(so.getHandle()); +} + +bool Stream::read(NetSocket* so) +{ + S32 handle = -1; + bool success = read(&handle); + *so = NetSocket::fromHandle(handle); + return success; +} + bool Stream::copyFrom(Stream *other) { U8 buffer[1024]; diff --git a/engine/source/io/rawData.h b/engine/source/io/rawData.h new file mode 100644 index 000000000..cce67b73f --- /dev/null +++ b/engine/source/io/rawData.h @@ -0,0 +1,157 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _RAWDATA_H_ +#define _RAWDATA_H_ + +#ifndef _PLATFORM_H_ +# include "platform/platform.h" +#endif +#ifndef _TYPETRAITS_H_ +# include "platform/typetraits.h" +#endif + + +template< typename T > +class RawDataT +{ + public: + + typedef void Parent; + typedef RawDataT< T > ThisType; + + /// Type of elements in the buffer. + typedef T ValueType; + + /// If true, the structure own the data buffer and will + /// delete[] it on destruction. + bool ownMemory; + + /// The data buffer. + T *data; + + /// Number of elements in the buffer. + U32 size; + + RawDataT() + : ownMemory(false), data(NULL), size(0) + { + } + + RawDataT( T* data, U32 size, bool ownMemory = false ) + : ownMemory( ownMemory ), data( data ), size( size ) {} + + RawDataT(const ThisType& rd) + { + data = rd.data; + size = rd.size; + ownMemory = false; + } + + ~RawDataT() + { + reset(); + } + + void reset() + { + if (ownMemory) + delete [] data; + + data = NULL; + ownMemory = false; + size = 0; + } + + void alloc(const U32 newSize) + { + reset(); + + ownMemory = true; + size = newSize; + data = new ValueType[newSize]; + } + + void operator =(const ThisType& rd) + { + data = rd.data; + size = rd.size; + ownMemory = false; + } + + /// Allocate a RawDataT instance inline with its data elements. + /// + /// @param Self RawDataT instance type; this is a type parameter so this + /// can work with types derived from RawDataT. + template< class Self > + static Self* allocInline( U32 numElements TORQUE_TMM_ARGS_DECL ) + { + const char* file = __FILE__; + U32 line = __LINE__; +#ifndef TORQUE_DISABLE_MEMORY_MANAGER + file = fileName; + line = lineNum; +#endif + Self* inst = ( Self* ) dMalloc_r( sizeof( Self ) + numElements * sizeof( ValueType ), file, line ); + ValueType* data = ( ValueType* ) ( inst + 1 ); + constructArray< ValueType >( data, numElements ); + return constructInPlace< Self >( inst, data, numElements ); + } +}; + +template< typename T > +struct TypeTraits< RawDataT< T >* > : public TypeTraits< typename RawDataT< T >::Parent* > +{ + struct Construct + { + template< typename R > + static R* single( U32 size ) + { + typedef typename TypeTraits< R >::BaseType Type; + return Type::template allocInline< Type >( size TORQUE_TMM_LOC ); + } + }; + struct Destruct + { + template< typename R > + static void single( R* ptr ) + { + destructInPlace( ptr ); + dFree( ptr ); + } + }; +}; + +/// Raw byte buffer. +/// This isn't a typedef to allow forward declarations. +class RawData : public RawDataT< S8 > +{ + public: + + typedef RawDataT< S8 > Parent; + + RawData() {} + RawData( S8* data, U32 size, bool ownMemory = false ) + : Parent( data, size, ownMemory ) {} +}; + +#endif // _RAWDATA_H_ diff --git a/engine/source/io/stream.h b/engine/source/io/stream.h index 22ab5c219..14ea06de9 100755 --- a/engine/source/io/stream.h +++ b/engine/source/io/stream.h @@ -60,6 +60,11 @@ class ColorI; class ColorF; +struct NetAddress; +class RawData; +// class String; +class NetSocket; + //------------------------------------------------------------------------------ //-------------------------------------- Base Stream class @@ -158,6 +163,15 @@ class Stream { /// Read a floating point color from the stream. bool read(ColorF*); + /// Write a network address to the stream. + bool write(const NetAddress &); + /// Read a network address from the stream. + bool read(NetAddress*); + + /// Write a network socket to the stream. + bool write(const NetSocket &); + /// Read a network socket from the stream. + bool read(NetSocket*); // Overloaded write and read ops.. public: diff --git a/engine/source/math/mNormalDistribution.h b/engine/source/math/mNormalDistribution.h new file mode 100644 index 000000000..daffe67c1 --- /dev/null +++ b/engine/source/math/mNormalDistribution.h @@ -0,0 +1,66 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2013 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _MNORMALDISTRIBUTION_H_ +#define _MNORMALDISTRIBUTION_H_ + +#include + +//----------------------------------------------------------------------------- +// Modified from this Stack Overflow answer: http://stackoverflow.com/a/28619226/289956 +//----------------------------------------------------------------------------- + +class NormalDistributionGenerator +{ + std::mt19937 generator; + std::normal_distribution distribution; + S32 min; + S32 max; +public: + NormalDistributionGenerator(S32 min, S32 max) : + distribution(std::round((min + max) / 2), std::round((max - min) / 6)), min(min), max(max) + { + generator.seed(Platform::getRealMilliseconds()); + } + + NormalDistributionGenerator(S32 min, S32 max, S32 mean) : + distribution(mean, std::round((max - min) / 6)), min(min), max(max) + { + generator.seed(Platform::getRealMilliseconds()); + } + + NormalDistributionGenerator(S32 min, S32 max, S32 mean, S32 stddev) : + distribution(mean, stddev), min(min), max(max) + { + generator.seed(Platform::getRealMilliseconds()); + } + + S32 operator ()() { + while (true) { + S32 number = (S32)std::round(this->distribution(generator)); + if (number >= this->min && number <= this->max) + return number; + } + } +}; + +#endif //_MNORMALDISTRIBUTION_H_ diff --git a/engine/source/math/random_ScriptBinding.h b/engine/source/math/random_ScriptBinding.h index ab1aefd2a..4d0b97cd6 100644 --- a/engine/source/math/random_ScriptBinding.h +++ b/engine/source/math/random_ScriptBinding.h @@ -20,6 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- +#include "math/mNormalDistribution.h" + ConsoleFunctionGroupBegin(RandomNumbers, "Functions relating to the generation of random numbers."); @@ -111,6 +113,61 @@ ConsoleFunctionWithDocs(getRandomF, ConsoleFloat, 3, 3, (min, max)) } +/*! Gets a random integer number with normal distribution (a bell curve) from min to max with optional mean and standard deviation. +@param min The minimum range of the random integer number. +@param max The maximum range of the random integer number. +@param mean The Most commonly occuring value or the center of the "bell". Must be between the min and max. Defaults to the center value between min and max. +@param stdDev The standard deviation affects how far values tend to be from the mean. Defaults to 1/6th of the difference between min and max. +@return A random floating-point number from min to max. +*/ +ConsoleFunctionWithDocs(getRandomBell, ConsoleInt, 3, 5, (min, max, [ mean ]?, [ stdDev ]?)) +{ + S32 min = dAtoi(argv[1]); + S32 max = dAtoi(argv[2]); + + if (min > max) + { + const S32 temp = min; + min = max; + max = temp; + } + + if (argc == 3) + { + NormalDistributionGenerator g(min, max); + return g(); + } + else if (argc > 3 && argc <= 5) + { + S32 mean = dAtoi(argv[3]); + if (mean > max) + { + mean = max; + } + + if (mean < min) + { + mean = min; + } + + if (argc == 4) + { + NormalDistributionGenerator g(min, max, mean); + return g(); + } + else + { + NormalDistributionGenerator g(min, max, mean, dAtoi(argv[4])); + return g(); + } + } + else + { + Con::warnf("getRandomBell() - Invalid number of parameters!"); + return 0; + } +} + //------------------------------------------------------------------------------ ConsoleFunctionGroupEnd(RandomNumbers) diff --git a/engine/source/network/RemoteCommandEvent_ScriptBinding.h b/engine/source/network/RemoteCommandEvent_ScriptBinding.h index 0ff21a30e..86f61be62 100644 --- a/engine/source/network/RemoteCommandEvent_ScriptBinding.h +++ b/engine/source/network/RemoteCommandEvent_ScriptBinding.h @@ -43,6 +43,18 @@ ConsoleFunctionWithDocs( commandToServer, ConsoleVoid, 2, RemoteCommandEvent::Ma sendRemoteCommand(conn, argc - 1, argv + 1); } +// Send command to other server by given address +// Useful when you connected to multi-servers +ConsoleFunction( commandToNamedServer, void, 3, RemoteCommandEvent::MaxRemoteCommandArgs + 2, "(NetConnection server, string func, ...)" + "Send a command to the server.") +{ + NetConnection *conn; + if(!Sim::findObject(argv[1], conn)) + return; + sendRemoteCommand(conn, argc - 2, argv + 2); +} + + /*! Use the commandToClient function to issue a remote procedure call on a client. All arguments (excluding client) may be in tagged or non-tagged format. See 'Remote Procedure Call Samples' below @param client The numeric ID of a client gameConnection. diff --git a/engine/source/network/netConnection.cc b/engine/source/network/netConnection.cc index 6bb736c43..5f8e6b8dd 100755 --- a/engine/source/network/netConnection.cc +++ b/engine/source/network/netConnection.cc @@ -57,6 +57,7 @@ class ConnectionMessageEvent : public NetEvent U32 message; U32 ghostCount; public: + typedef NetEvent Parent; ConnectionMessageEvent(U32 msg=0, U32 seq=0, U32 gc=0) { message = msg; sequence = seq; ghostCount = gc;} void pack(NetConnection *, BitStream *bstream) @@ -101,7 +102,7 @@ bool NetConnection::mFilesWereDownloaded = false; static inline U32 HashNetAddress(const NetAddress *addr) { - return *((U32 *)addr->netNum) % NetConnection::HashTableSize; + return addr->getHash() % NetConnection::HashTableSize; } NetConnection *NetConnection::lookup(const NetAddress *addr) @@ -159,7 +160,7 @@ U32 NetConnection::getSequence() static U32 gPacketRateToServer = 32; static U32 gPacketUpdateDelayToServer = 32; static U32 gPacketRateToClient = 10; -static U32 gPacketSize = 200; +static U32 gPacketSize = 508; void NetConnection::consoleInit() { @@ -223,6 +224,7 @@ void NetConnection::setNetClassGroup(U32 grp) } NetConnection::NetConnection() + : mNetAddress() { mTranslateStrings = false; mConnectSequence = 0; @@ -302,10 +304,13 @@ NetConnection::NetConnection() mCurrentFileBufferSize = 0; mCurrentFileBufferOffset = 0; mNumDownloadedFiles = 0; + // Ensure NetAddress is cleared + dMemset(&mNetAddress, '\0', sizeof(NetAddress)); } NetConnection::~NetConnection() { + GNet->removePendingConnection(this); AssertFatal(mNotifyQueueHead == NULL, "Uncleared notifies remain."); netAddressTableRemove(); @@ -460,14 +465,14 @@ void NetConnection::handlePacket(BitStream *bstream) if(bstream->readFlag()) { - mCurRate.updateDelay = bstream->readInt(10); - mCurRate.packetSize = bstream->readInt(10); + mCurRate.updateDelay = bstream->readInt(12); + mCurRate.packetSize = bstream->readInt(12); } if(bstream->readFlag()) { - U32 omaxDelay = bstream->readInt(10); - S32 omaxSize = bstream->readInt(10); + U32 omaxDelay = bstream->readInt(12); + S32 omaxSize = bstream->readInt(12); if(omaxDelay < mMaxRate.updateDelay) omaxDelay = mMaxRate.updateDelay; if(omaxSize > mMaxRate.packetSize) @@ -556,14 +561,14 @@ void NetConnection::checkPacketSend(bool force) if(stream->writeFlag(mCurRate.changed)) { - stream->writeInt(mCurRate.updateDelay, 10); - stream->writeInt(mCurRate.packetSize, 10); + stream->writeInt(mCurRate.updateDelay, 12); + stream->writeInt(mCurRate.packetSize, 12); mCurRate.changed = false; } if(stream->writeFlag(mMaxRate.changed)) { - stream->writeInt(mMaxRate.updateDelay, 10); - stream->writeInt(mMaxRate.packetSize, 10); + stream->writeInt(mMaxRate.updateDelay, 12); + stream->writeInt(mMaxRate.packetSize, 12); mMaxRate.changed = false; } DEBUG_LOG(("PKLOG %d START", getId()) ); diff --git a/engine/source/network/netConnection.h b/engine/source/network/netConnection.h index 944027d59..91c201f70 100755 --- a/engine/source/network/netConnection.h +++ b/engine/source/network/netConnection.h @@ -544,6 +544,8 @@ class NetConnection : public ConnectionProtocol, public SimGroup U32 mConnectSendCount; U32 mConnectLastSendTime; + SimObjectPtr getRemoteConnection() { return mRemoteConnection; } + public: static NetConnection *getConnectionToServer() { return mServerConnection; } diff --git a/engine/source/network/netConnection_ScriptBinding.h b/engine/source/network/netConnection_ScriptBinding.h index 81d615b04..6c5671e3c 100644 --- a/engine/source/network/netConnection_ScriptBinding.h +++ b/engine/source/network/netConnection_ScriptBinding.h @@ -146,7 +146,7 @@ ConsoleMethodWithDocs(NetConnection, getGhostID, ConsoleInt, 3, 3, ( S32 realID ConsoleMethodWithDocs(NetConnection, connect, ConsoleVoid, 3, 3, ( remoteAddress )) { NetAddress addr; - if(!Net::stringToAddress(argv[2], &addr)) + if(Net::stringToAddress(argv[2], &addr) != Net::NoError) { Con::errorf("NetConnection::connect: invalid address - %s", argv[2]); return; @@ -163,11 +163,14 @@ ConsoleMethodWithDocs(NetConnection, connectLocal, ConsoleString, 2, 2, ()) ConsoleObject *co = ConsoleObject::create(object->getClassName()); NetConnection *client = object; NetConnection *server = dynamic_cast(co); - const char *error = NULL; BitStream *stream = BitStream::getPacketStream(); if(!server || !server->canRemoteCreate()) - goto errorOut; + { + delete co; + return "error"; + } + server->registerObject(); server->setIsLocalClientConnection(); @@ -176,18 +179,34 @@ ConsoleMethodWithDocs(NetConnection, connectLocal, ConsoleString, 2, 2, ()) client->setRemoteConnectionObject(server); server->setRemoteConnectionObject(client); + //We need to reset the maxrate's here, because we + // can't test if it is a local connection until RemoteConnectionObject + // has been set + server->checkMaxRate(); + client->checkMaxRate(); + stream->setPosition(0); client->writeConnectRequest(stream); stream->setPosition(0); + + const char* error; if(!server->readConnectRequest(stream, &error)) - goto errorOut; + { + client->onConnectionRejected(error); + server->deleteObject(); + return "error"; + } stream->setPosition(0); server->writeConnectAccept(stream); stream->setPosition(0); if(!client->readConnectAccept(stream, &error)) - goto errorOut; + { + client->handleStartupError(error); + server->deleteObject(); + return "error"; + } client->onConnectionEstablished(true); server->onConnectionEstablished(false); @@ -197,14 +216,8 @@ ConsoleMethodWithDocs(NetConnection, connectLocal, ConsoleString, 2, 2, ()) server->setConnectSequence(0); NetConnection::setLocalClientConnection(server); server->assignName("LocalClientConnection"); - return ""; -errorOut: - server->deleteObject(); - client->deleteObject(); - if(!error) - error = "Unknown Error"; - return error; + return ""; } /*! Use the getGhostsActive method to determine how many ghosts are active on a particular connection. diff --git a/engine/source/network/netInterface.cc b/engine/source/network/netInterface.cc index cadbe3718..ae2e85a9d 100755 --- a/engine/source/network/netInterface.cc +++ b/engine/source/network/netInterface.cc @@ -30,6 +30,11 @@ #include "netInterface_ScriptBinding.h" +#ifdef GGC_PLUGIN +#include "GGCNatTunnel.h" +extern void HandleGGCPacket(NetAddress* addr, unsigned char* data, U32 dataSize); +#endif + NetInterface *GNet = NULL; NetInterface::NetInterface() @@ -38,7 +43,7 @@ NetInterface::NetInterface() GNet = this; mLastTimeoutCheckTime = 0; - mAllowConnections = true; + mAllowConnections = false; } @@ -108,8 +113,14 @@ void NetInterface::processPacketReceiveEvent(PacketReceiveEvent *prEvent) pStream.read(&packetType); NetAddress *addr = &prEvent->sourceAddress; - if(packetType <= GameHeartbeat) + if(packetType <= GameHeartbeat || packetType == MasterServerExtendedListResponse) handleInfoPacket(addr, packetType, &pStream); +#ifdef GGC_PLUGIN + else if (packetType == GGCPacket) + { + HandleGGCPacket(addr, (U8*)packetData.data, dataSize); + } +#endif else { // check if there's a connection already: @@ -547,10 +558,7 @@ void NetInterface::computeNetMD5(const NetAddress *address, U32 connectSequence, U32 in[16]; in[0] = address->type; - in[1] = (U32(address->netNum[0]) << 24) | - (U32(address->netNum[1]) << 16) | - (U32(address->netNum[2]) << 8) | - (U32(address->netNum[3])); + in[1] = address->getHash(); in[2] = address->port; in[3] = connectSequence; for(U32 i = 0; i < 12; i++) diff --git a/engine/source/network/netInterface.h b/engine/source/network/netInterface.h index 7e5dd439c..50c0553c0 100755 --- a/engine/source/network/netInterface.h +++ b/engine/source/network/netInterface.h @@ -46,7 +46,7 @@ class NetInterface GameInfoRequest = 18, GameInfoResponse = 20, GameHeartbeat = 22, - + GGCPacket = 24, ConnectChallengeRequest = 26, ConnectChallengeReject = 28, ConnectChallengeResponse = 30, @@ -54,6 +54,9 @@ class NetInterface ConnectReject = 34, ConnectAccept = 36, Disconnect = 38, + MasterServerExtendedListResponse = 40, + MasterServerChallenge = 42, + MasterServerExtendedListRequest = 44, }; protected: @@ -83,7 +86,6 @@ class NetInterface void addPendingConnection(NetConnection *conn); NetConnection *findPendingConnection(const NetAddress *address, U32 packetSequence); - void removePendingConnection(NetConnection *conn); void sendConnectChallengeRequest(NetConnection *conn); void handleConnectChallengeRequest(const NetAddress *addr, BitStream *stream); @@ -108,7 +110,7 @@ class NetInterface public: NetInterface(); - + void removePendingConnection(NetConnection *conn); /// Returns whether or not this NetInterface allows connections from remote hosts. bool doesAllowConnections() { return mAllowConnections; } diff --git a/engine/source/network/serverQuery.cc b/engine/source/network/serverQuery.cc index 7505f5aaa..1468b69e8 100755 --- a/engine/source/network/serverQuery.cc +++ b/engine/source/network/serverQuery.cc @@ -160,11 +160,13 @@ static Vector gQueryList(__FILE__, __LINE__); struct PacketStatus { - U8 index; + U16 index; S32 key; U32 time; U32 tryCount; + PacketStatus() : index( 0 ), key(-1), time(0), tryCount( gPacketRetryCount ) {}; + PacketStatus( U8 _index, S32 _key, U32 _time ) { index = _index; @@ -172,6 +174,9 @@ struct PacketStatus time = _time; tryCount = gPacketRetryCount; } + + inline U8 getOldIndex() { return (U8)index; } + inline U16 getIndex() { return index; } }; static Vector gPacketStatusList(__FILE__, __LINE__); @@ -188,15 +193,12 @@ struct ServerFilter Favorites = 3, }; - Type type; - char* gameType; - char* missionType; - enum // Query Flags { OnlineQuery = 0, // Authenticated with master OfflineQuery = BIT(0), // On our own NoStringCompress = BIT(1), + NewStyleResponse = BIT(2), // Include IPV6 servers }; enum // Filter flags: @@ -204,23 +206,36 @@ struct ServerFilter Dedicated = BIT(0), NotPassworded = BIT(1), Linux = BIT(2), - CurrentVersion = BIT(7), + CurrentVersion = BIT(6) }; + enum // Region mask flags + { + RegionIsIPV4Address = BIT(30), + RegionIsIPV6Address = BIT(31), + + RegionAddressMask = RegionIsIPV4Address | RegionIsIPV6Address + }; + + //Rearranging the fields according to their sizes + char* gameType; + char* missionType; U8 queryFlags; U8 minPlayers; U8 maxPlayers; U8 maxBots; - U32 regionMask; - U32 maxPing; U8 filterFlags; - U16 minCPU; U8 buddyCount; + U16 minCPU; + U32 regionMask; + U32 maxPing; U32* buddyList; + Type type; ServerFilter() { - queryFlags = 0; + type = Normal; + queryFlags = NewStyleResponse; gameType = NULL; missionType = NULL; minPlayers = 0; @@ -381,10 +396,18 @@ void queryLanServers(U32 port, U8 flags, const char* gameType, const char* missi NetAddress addr; char addrText[256]; + + // IPV4 dSprintf( addrText, sizeof( addrText ), "IP:BROADCAST:%d", port ); Net::stringToAddress( addrText, &addr ); pushPingBroadcast( &addr ); + // IPV6 + dSprintf(addrText, sizeof(addrText), "IP6:MULTICAST:%d", port); + Net::stringToAddress(addrText, &addr); + pushPingBroadcast(&addr); + + Con::executef( 4, "onServerQueryStatus", "start", "Querying LAN servers", "0"); processPingsAndQueries( gPingSession ); } @@ -433,7 +456,7 @@ void queryMasterServer(U8 flags, const char* gameType, const char* missionType, dStrcpy( sActiveFilter.missionType, missionType ); } - sActiveFilter.queryFlags = flags; + sActiveFilter.queryFlags = flags | ServerFilter::NewStyleResponse; sActiveFilter.minPlayers = minPlayers; sActiveFilter.maxPlayers = maxPlayers; sActiveFilter.maxBots = maxBots; @@ -450,6 +473,7 @@ void queryMasterServer(U8 flags, const char* gameType, const char* missionType, sActiveFilter.type = ServerFilter::Buddy; sActiveFilter.buddyCount = buddyCount; sActiveFilter.buddyList = (U32*) dRealloc( sActiveFilter.buddyList, buddyCount * 4 ); + sActiveFilter.queryFlags = ServerFilter::NewStyleResponse; dMemcpy( sActiveFilter.buddyList, buddyList, buddyCount * 4 ); clearServerList(); } @@ -628,7 +652,7 @@ Vector* getMasterServerList() U32 region = 1; // needs to default to something > 0 dSscanf(master,"%d:",®ion); const char* madd = dStrchr(master,':') + 1; - if (region && Net::stringToAddress(madd,&address)) { + if (region && Net::stringToAddress(madd,&address) == Net::NoError) { masterList.increment(); MasterInfo& info = masterList.last(); info.address = address; @@ -1022,10 +1046,13 @@ static void processMasterServerQuery( U32 session ) // Send a request to the master server for the server list: BitStream *out = BitStream::getPacketStream(); + out->write( U8( NetInterface::MasterServerListRequest ) ); + out->write( U8( sActiveFilter.queryFlags) ); out->write( ( gMasterServerPing.session << 16 ) | ( gMasterServerPing.key & 0xFFFF ) ); out->write( U8( 255 ) ); + writeCString( out, sActiveFilter.gameType ); writeCString( out, sActiveFilter.missionType ); out->write( sActiveFilter.minPlayers ); @@ -1210,22 +1237,34 @@ static void processServerListPackets( U32 session ) if ( !p.tryCount ) { // Packet timed out :( - Con::printf( "Server list packet #%d timed out.", p.index + 1 ); + Con::printf( "Server list packet #%d timed out.", p.getIndex() + 1 ); gPacketStatusList.erase( i ); } else { // Try again... - Con::printf( "Rerequesting server list packet #%d...", p.index + 1 ); + Con::printf( "Rerequesting server list packet #%d...", p.getIndex() + 1 ); p.tryCount--; p.time = currentTime; p.key = gKey++; BitStream *out = BitStream::getPacketStream(); + bool extendedPacket = (sActiveFilter.queryFlags & ServerFilter::NewStyleResponse) != 0; + + + if ( extendedPacket ) + out->write( U8( NetInterface::MasterServerExtendedListRequest ) ); + else out->write( U8( NetInterface::MasterServerListRequest ) ); + out->write( U8( sActiveFilter.queryFlags ) ); // flags out->write( ( session << 16) | ( p.key & 0xFFFF ) ); - out->write( p.index ); // packet index + + if ( extendedPacket ) + out->write( p.getOldIndex() ); // packet index + else + out->write( p.getIndex() ); // packet index + out->write( U8( 0 ) ); // game type out->write( U8( 0 ) ); // mission type out->write( U8( 0 ) ); // minPlayers @@ -1419,6 +1458,98 @@ static void handleMasterServerListResponse( BitStream* stream, U32 key, U8 /*fla //----------------------------------------------------------------------------- +static void handleExtendedMasterServerListResponse(BitStream* stream, U32 key, U8 /*flags*/) +{ + U16 packetIndex, packetTotal; + U32 i; + U16 serverCount, port; + U8 netNum[16]; + char addressBuffer[256]; + NetAddress addr; + + stream->read(&packetIndex); + // Validate the packet key: + U32 packetKey = gMasterServerPing.key; + if (gGotFirstListPacket) + { + for (i = 0; i < (U32)gPacketStatusList.size(); i++) + { + if (gPacketStatusList[i].index == packetIndex) + { + packetKey = gPacketStatusList[i].key; + break; + } + } + } + + U32 testKey = (gPingSession << 16) | (packetKey & 0xFFFF); + if (testKey != key) + return; + + stream->read(&packetTotal); + stream->read(&serverCount); + + Con::printf("Received server list packet %d of %d from the master server (%d servers).", (packetIndex + 1), packetTotal, serverCount); + + // Enter all of the servers in this packet into the ping list: + for (i = 0; i < serverCount; i++) + { + U8 type; + stream->read(&type); + dMemset(&addr, '\0', sizeof(NetAddress)); + + if (type == 0) + { + // IPV4 + addr.type = NetAddress::IPAddress; + stream->read(4, &addr.address.ipv4.netNum[0]); + stream->read(&addr.port); + } + else + { + // IPV6 + addr.type = NetAddress::IPV6Address; + stream->read(16, &addr.address.ipv6.netNum[0]); + stream->read(&addr.port); + } + + pushPingRequest(&addr); + } + + // If this is the first list packet we have received, fill the packet status list + // and start processing: + if (!gGotFirstListPacket) + { + gGotFirstListPacket = true; + gMasterServerQueryAddress = gMasterServerPing.address; + U32 currentTime = Platform::getVirtualMilliseconds(); + for (i = 0; i < packetTotal; i++) + { + if (i != packetIndex) + { + PacketStatus* p = new PacketStatus(i, gMasterServerPing.key, currentTime); + gPacketStatusList.push_back(*p); + } + } + + processServerListPackets(gPingSession); + } + else + { + // Remove the packet we just received from the status list: + for (i = 0; i < (U32)gPacketStatusList.size(); i++) + { + if ( gPacketStatusList[i].index == packetIndex ) + { + gPacketStatusList.erase( i ); + break; + } + } + } +} + +//----------------------------------------------------------------------------- + static void handleGameMasterInfoRequest( const NetAddress* address, U32 key, U8 flags ) { if ( GNet->doesAllowConnections() ) @@ -1435,7 +1566,7 @@ static void handleGameMasterInfoRequest( const NetAddress* address, U32 key, U8 for(U32 i = 0; i < (U32)masterList->size(); i++) { masterAddr = &(*masterList)[i].address; - if (*(U32*)(masterAddr->netNum) == *(U32*)(address->netNum)) + if (masterAddr->isSameAddress(*address)) { fromMaster = true; break; @@ -1801,7 +1932,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream // Get the mission name: stream->readString( stringBuf ); // Clip the file extension off: - char* temp = dStrstr( static_cast( stringBuf ), const_cast( ".mis" ) ); + char* temp = dStrstr( stringBuf, ".mis" ); if ( temp ) *temp = '\0'; if ( !si->missionName || dStrcmp( si->missionName, stringBuf ) != 0 ) @@ -1930,5 +2061,9 @@ void DemoNetInterface::handleInfoPacket( const NetAddress* address, U8 packetTyp case GameMasterInfoRequest: handleGameMasterInfoRequest( address, key, flags ); break; + + case MasterServerExtendedListResponse: + handleExtendedMasterServerListResponse(stream, key, flags); + break; } } diff --git a/engine/source/network/tcpObject.cc b/engine/source/network/tcpObject.cc index 1488282b0..c4504c6f0 100755 --- a/engine/source/network/tcpObject.cc +++ b/engine/source/network/tcpObject.cc @@ -28,6 +28,7 @@ #include "sim/simBase.h" #include "console/consoleInternal.h" #include "game/defaultGame.h" +#include "collection/vector.h" #ifdef TORQUE_OS_IOS #include "platformiOS/iOSUtil.h" @@ -41,8 +42,8 @@ IMPLEMENT_CONOBJECT(TCPObject); TCPObject *TCPObject::find(NetSocket tag) { - for(TCPObject *walk = table[U32(tag) & TableMask]; walk; walk = walk->mNext) - if(walk->mTag == tag) + for(TCPObject *walk = table[tag.getHash() & TableMask]; walk; walk = walk->mNext) + if(walk->mTag.getHash() == tag.getHash()) return walk; return NULL; } @@ -51,13 +52,13 @@ void TCPObject::addToTable(NetSocket newTag) { removeFromTable(); mTag = newTag; - mNext = table[U32(mTag) & TableMask]; - table[U32(mTag) & TableMask] = this; + mNext = table[mTag.getHash() & TableMask]; + table[mTag.getHash() & TableMask] = this; } void TCPObject::removeFromTable() { - for(TCPObject **walk = &table[U32(mTag) & TableMask]; *walk; walk = &((*walk)->mNext)) + for(TCPObject **walk = &table[mTag.getHash() & TableMask]; *walk; walk = &((*walk)->mNext)) { if(*walk == this) { @@ -72,7 +73,7 @@ TCPObject::TCPObject() mBuffer = NULL; mBufferSize = 0; mPort = 0; - mTag = InvalidSocket; + mTag = NetSocket::INVALID; mNext = NULL; mState = Disconnected; } @@ -89,7 +90,7 @@ bool TCPObject::processArguments(S32 argc, const char **argv) return true; else if(argc == 1) { - addToTable(U32(dAtoi(argv[0]))); + addToTable(NetSocket::fromHandle(dAtoi(argv[0]))); return true; } return false; @@ -221,6 +222,21 @@ void TCPObject::finishLastLine() } } +bool TCPObject::isBufferEmpty() +{ + return (mBufferSize <= 0); +} + +void TCPObject::emptyBuffer() +{ + if(mBufferSize) + { + dFree(mBuffer); + mBuffer = 0; + mBufferSize = 0; + } +} + void TCPObject::onDisconnect() { finishLastLine(); @@ -231,7 +247,7 @@ void TCPObject::onDisconnect() void TCPObject::listen(U16 port) { mState = Listening; - U32 newTag = Net::openListenPort(port); + NetSocket newTag = Net::openListenPort(port); addToTable(newTag); } @@ -260,11 +276,11 @@ void TCPObject::openAndConnect(const char *address) void TCPObject::disconnect() { - if( mTag != InvalidSocket ) { + if( mTag != NetSocket::INVALID ) { Net::closeConnectTo(mTag); } removeFromTable(); - mTag = InvalidSocket; + mTag = NetSocket::INVALID; } @@ -345,6 +361,24 @@ void DefaultGame::processConnectedReceiveEvent(ConnectedReceiveEvent* event ) size -= ret; buffer += ret; } + + //If our buffer now has something in it then it's probably a web socket packet and lets handle it + if(!tcpo->isBufferEmpty()) + { + //Copy all the data into a string (may be a quicker way of doing this) + U8 *data = event->data; + + //Send the packet to script + bool handled = Con::executef(tcpo, 2, "onPacket", data); + + //If the script did something with it, clear the buffer + if(handled) + { + tcpo->emptyBuffer(); + } + } + + Con::executef(tcpo, 1, "onEndReceive"); } void DefaultGame::processConnectedAcceptEvent( ConnectedAcceptEvent* event ) @@ -352,7 +386,7 @@ void DefaultGame::processConnectedAcceptEvent( ConnectedAcceptEvent* event ) TCPObject *tcpo = TCPObject::find(event->portTag); if(!tcpo) return; - tcpo->onConnectionRequest(&event->address, event->connectionTag); + tcpo->onConnectionRequest(&event->address, event->connectionTag.getHandle()); } void DefaultGame::processConnectedNotifyEvent( ConnectedNotifyEvent* event ) diff --git a/engine/source/network/tcpObject.h b/engine/source/network/tcpObject.h index ca696365b..3e2474ab2 100755 --- a/engine/source/network/tcpObject.h +++ b/engine/source/network/tcpObject.h @@ -51,6 +51,8 @@ class TCPObject : public SimObject void parseLine(U8 *buffer, U32 *start, U32 bufferLen); void finishLastLine(); + bool isBufferEmpty(); + void emptyBuffer(); static TCPObject *find(NetSocket tag); diff --git a/engine/source/network/telnetConsole.cc b/engine/source/network/telnetConsole.cc index 7233404c9..8e8acb79a 100755 --- a/engine/source/network/telnetConsole.cc +++ b/engine/source/network/telnetConsole.cc @@ -50,7 +50,7 @@ TelnetConsole::TelnetConsole() { Con::addConsumer(telnetCallback); - mAcceptSocket = InvalidSocket; + mAcceptSocket = NetSocket::INVALID; mAcceptPort = -1; mClientList = NULL; mRemoteEchoEnabled = false; @@ -59,13 +59,13 @@ TelnetConsole::TelnetConsole() TelnetConsole::~TelnetConsole() { Con::removeConsumer(telnetCallback); - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) Net::closeSocket(mAcceptSocket); TelnetClient *walk = mClientList, *temp; while(walk) { temp = walk->nextClient; - if(walk->socket != InvalidSocket) + if(walk->socket != NetSocket::INVALID) Net::closeSocket(walk->socket); delete walk; walk = temp; @@ -79,16 +79,20 @@ void TelnetConsole::setTelnetParameters(S32 port, const char *telnetPassword, co mRemoteEchoEnabled = remoteEcho; - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) { Net::closeSocket(mAcceptSocket); - mAcceptSocket = InvalidSocket; + mAcceptSocket = NetSocket::INVALID; } mAcceptPort = port; if(mAcceptPort != -1 && mAcceptPort != 0) { + NetAddress address; + Net::getIdealListenAddress(&address); + address.port = mAcceptPort; + mAcceptSocket = Net::openSocket(); - Net::bind(mAcceptSocket, mAcceptPort); + Net::bindAddress(address, mAcceptSocket); Net::listen(mAcceptSocket, 4); Net::setBlocking(mAcceptSocket, false); @@ -107,40 +111,48 @@ void TelnetConsole::processConsoleLine(const char *consoleLine) { if(walk->state == FullAccessConnected || walk->state == ReadOnlyConnected) { - if ( walk->socket != InvalidSocket ) - { Net::send(walk->socket, (const unsigned char*)consoleLine, len); Net::send(walk->socket, (const unsigned char*)"\r\n", 2); } } } -} void TelnetConsole::process() { NetAddress address; - if(mAcceptSocket != InvalidSocket) + if(mAcceptSocket != NetSocket::INVALID) { // ok, see if we have any new connections: NetSocket newConnection; newConnection = Net::accept(mAcceptSocket, &address); - if(newConnection != InvalidSocket) + if(newConnection != NetSocket::INVALID) { - Con::printf ("Telnet connection from %i.%i.%i.%i", - address.netNum[0], address.netNum[1], address.netNum[2], address.netNum[3]); + char buffer[256]; + Net::addressToString(&address, buffer); + Con::printf("Telnet connection from %s", buffer); TelnetClient *cl = new TelnetClient; cl->socket = newConnection; cl->curPos = 0; +#if defined(TORQUE_SHIPPING) && defined(TORQUE_DISABLE_TELNET_CONSOLE_PASSWORD) + // disable the password in a ship build? WTF. lets make an error: + PleaseMakeSureYouKnowWhatYouAreDoingAndCommentOutThisLineIfSo. +#elif !defined(TORQUE_SHIPPING) && defined(TORQUE_DISABLE_TELNET_CONSOLE_PASSWORD) + cl->state = FullAccessConnected; +#else cl->state = PasswordTryOne; +#endif Net::setBlocking(newConnection, false); - const char *connectMessage = "Torque Telnet Remote Console\r\n\r\nEnter Password:"; + const char *prompt = Con::getVariable("Con::Prompt"); + char connectMessage[1024]; + dSprintf(connectMessage, sizeof(connectMessage), + "Torque Telnet Remote Console\r\n\r\n%s", + cl->state == FullAccessConnected ? prompt : "Enter Password:"); - if ( cl->socket != InvalidSocket ) Net::send(cl->socket, (const unsigned char*)connectMessage, dStrlen(connectMessage)+1); cl->nextClient = mClientList; mClientList = cl; @@ -155,18 +167,12 @@ void TelnetConsole::process() for(TelnetClient *client = mClientList; client; client = client->nextClient) { S32 numBytes; - Net::Error err = Net::NotASocket; - - if ( client->socket != InvalidSocket ) - Net::recv(client->socket, (unsigned char*)recvBuf, sizeof(recvBuf), &numBytes); + Net::Error err = Net::recv(client->socket, (unsigned char*)recvBuf, sizeof(recvBuf), &numBytes); if((err != Net::NoError && err != Net::WouldBlock) || numBytes == 0) { - if ( client->socket != InvalidSocket ) - { Net::closeSocket(client->socket); - client->socket = InvalidSocket; - } + client->socket = NetSocket::INVALID; continue; } @@ -187,7 +193,6 @@ void TelnetConsole::process() if(client->state == FullAccessConnected) { - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)reply, replyPos); replyPos = 0; @@ -197,12 +202,10 @@ void TelnetConsole::process() // note - send prompt next const char *prompt = Con::getVariable("Con::Prompt"); - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)prompt, dStrlen(prompt)); } else if(client->state == ReadOnlyConnected) { - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)reply, replyPos); replyPos = 0; } @@ -211,25 +214,21 @@ void TelnetConsole::process() client->state++; if(!dStrncmp(client->curLine, mTelnetPassword, PasswordMaxLength)) { - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)reply, replyPos); replyPos = 0; // send prompt const char *prompt = Con::getVariable("Con::Prompt"); - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)prompt, dStrlen(prompt)); client->state = FullAccessConnected; } else if(!dStrncmp(client->curLine, mListenPassword, PasswordMaxLength)) { - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)reply, replyPos); replyPos = 0; // send prompt const char *listenConnected = "Connected.\r\n"; - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)listenConnected, dStrlen(listenConnected)); client->state = ReadOnlyConnected; } @@ -240,15 +239,11 @@ void TelnetConsole::process() sendStr = "Too many tries... cya."; else sendStr = "Nope... try agian.\r\nEnter Password:"; - if ( client->socket != InvalidSocket ) Net::send(client->socket, (const unsigned char*)sendStr, dStrlen(sendStr)); if(client->state == DisconnectThisDude) { - if ( client->socket != InvalidSocket ) - { - Net::closeSocket(client->socket); - client->socket = InvalidSocket; - } + Net::closeSocket(client->socket); + client->socket = NetSocket::INVALID; } } } @@ -279,17 +274,14 @@ void TelnetConsole::process() // Echo the character back to the user, unless the remote echo // is disabled (by default) if(replyPos && mRemoteEchoEnabled) - { - if ( client->socket != InvalidSocket ) - Net::send(client->socket, (const unsigned char*)reply, replyPos); - } + Net::send(client->socket, (const unsigned char*)reply, replyPos); } TelnetClient ** walk = &mClientList; TelnetClient *cl; while((cl = *walk) != NULL) { - if(cl->socket == InvalidSocket) + if(cl->socket == NetSocket::INVALID) { *walk = cl->nextClient; delete cl; diff --git a/engine/source/persistence/SimXMLDocument.cpp b/engine/source/persistence/SimXMLDocument.cpp index b9c753511..29b025233 100755 --- a/engine/source/persistence/SimXMLDocument.cpp +++ b/engine/source/persistence/SimXMLDocument.cpp @@ -129,7 +129,7 @@ S32 SimXMLDocument::saveFile(const char* rFileName) char buffer[1024]; Con::expandPath(buffer, sizeof(buffer), rFileName); - if(buffer == NULL || *buffer == 0) + if(*buffer == 0) return false; FileStream strm; diff --git a/engine/source/persistence/taml/taml.cc b/engine/source/persistence/taml/taml.cc index 05d529dda..887d5bd6e 100755 --- a/engine/source/persistence/taml/taml.cc +++ b/engine/source/persistence/taml/taml.cc @@ -226,6 +226,12 @@ bool Taml::write( SimObject* pSimObject, const char* pFilename ) AssertFatal( pSimObject != NULL, "Cannot write a NULL object." ); AssertFatal( pFilename != NULL, "Cannot write to a NULL filename." ); + if (!Platform::createPath(pFilename)) + { + Con::warnf("Taml::writeFile() - Unable to create path for file '%s'", pFilename); + return false; + } + // Expand the file-name into the file-path buffer. Con::expandPath( mFilePathBuffer, sizeof(mFilePathBuffer), pFilename ); diff --git a/engine/source/platform/event.h b/engine/source/platform/event.h index 6711f7212..2dacd694d 100755 --- a/engine/source/platform/event.h +++ b/engine/source/platform/event.h @@ -34,31 +34,10 @@ #ifndef _PLATFORM_MEMORY_H_ #include "platform/platformMemory.h" #endif +#include "platform/platformNet.h" typedef int NetConnectionId; -/// Generic network address -/// -/// This is used to represent IP addresses. -struct NetAddress { - int type; ///< Type of address (IPAddress currently) - - /// Acceptable NetAddress types. - enum { - IPAddress, - IPXAddress - }; - - U8 netNum[4]; ///< For IP: sin_addr
- /// For IPX: sa_netnum - - U8 nodeNum[6]; ///< For IP: Not used.
- /// For IPX: sa_nodenum (not used by IP) - - U16 port; ///< For IP: sin_port
- /// For IPX: sa_socket -}; - enum EventConstants { MaxPacketDataSize = 1500, ///< Maximum allowed size of a packet. @@ -108,14 +87,14 @@ struct ConnectedNotifyEvent : public Event }; U32 state; ///< Indicates current connection state. - U32 tag; ///< Identifies connection. + NetSocket tag; ///< Identifies connection. ConnectedNotifyEvent() { type = ConnectedNotifyEventType; size = sizeof(ConnectedNotifyEvent); } }; /// Triggered when we receive data from a connected entity. struct ConnectedReceiveEvent : public Event { - U32 tag; ///< Identifies connection + NetSocket tag; ///< Identifies connection U8 data[MaxPacketDataSize]; /// Payload ConnectedReceiveEvent() { type = ConnectedReceiveEventType; } }; @@ -123,8 +102,8 @@ struct ConnectedReceiveEvent : public Event /// Triggered when we accept a new connection. struct ConnectedAcceptEvent : public Event { - U32 portTag; ///< Identifies port we received this connection on. - U32 connectionTag; ///< Identifies the connection. + NetSocket portTag; ///< Identifies port we received this connection on. + NetSocket connectionTag; ///< Identifies the connection. NetAddress address; ///< Originating address of connection. ConnectedAcceptEvent() { type = ConnectedAcceptEventType; size = sizeof(ConnectedAcceptEvent); } }; @@ -473,14 +452,6 @@ enum GestureCodes SI_SCALE_GESTURE = 0x408 }; -enum LeapMotionCodes -{ - LM_HANDAXIS = 0x409, - LM_HANDROT = 0x40A, - LM_HANDPOS = 0x40B, - LM_FINGERPOS = 0x40C, -}; - /// Input device types enum InputDeviceTypes { @@ -492,8 +463,7 @@ enum InputDeviceTypes XInputDeviceType, ScreenTouchDeviceType, AccelerometerDeviceType, - GyroscopeDeviceType, - LeapMotionDeviceType + GyroscopeDeviceType }; /// Device Event Action Types @@ -512,7 +482,6 @@ enum InputDeviceTypes #define SI_TOUCH 0x0C #define SI_GESTURE 0x0D #define SI_MOTION 0x0F -#define SI_LEAP 0x11 /// Event SubTypes #define SI_ANY 0xff diff --git a/engine/source/platform/platform.h b/engine/source/platform/platform.h index 1bcb1b2af..2db720294 100755 --- a/engine/source/platform/platform.h +++ b/engine/source/platform/platform.h @@ -55,8 +55,8 @@ #include "platform/platformString.h" #endif -#ifndef _PLATFORM_NETWORK_H_ -#include "platform/platformNetwork.h" +#ifndef _PLATFORM_PLATFORMNET_H_ +#include "platform/platformNet.h" #endif #ifndef _PLATFORM_MEMORY_H_ @@ -80,6 +80,19 @@ template class Vector; class Point2I; +//------------------------------------------------------------------------------ +/// Memory functions + +#if !defined(TORQUE_DISABLE_MEMORY_MANAGER) +# define TORQUE_TMM_ARGS_DECL , const char* fileName, const U32 lineNum +# define TORQUE_TMM_ARGS , fileName, lineNum +# define TORQUE_TMM_LOC , __FILE__, __LINE__ +#else +# define TORQUE_TMM_ARGS_DECL +# define TORQUE_TMM_ARGS +# define TORQUE_TMM_LOC +#endif + //------------------------------------------------------------------------------ struct Platform diff --git a/engine/source/platform/platformNet.cpp b/engine/source/platform/platformNet.cpp new file mode 100644 index 000000000..56f1a4a26 --- /dev/null +++ b/engine/source/platform/platformNet.cpp @@ -0,0 +1,2036 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#include "platform/platformNet.h" +#include "platform/threads/mutex.h" +#include "platform/event.h" +#include "algorithm/hashFunction.h" +#include "console/console.h" +#include "game/gameInterface.h" +#include "io/fileStream.h" +#include "collection/vector.h" +#include "platform/platformNetAsync.h" +#include + +// jamesu - debug DNS +//#define TORQUE_DEBUG_LOOKUPS + + +#if defined (TORQUE_OS_WIN32) +#define TORQUE_USE_WINSOCK +#include +#include + +#ifndef EINPROGRESS +#define EINPROGRESS WSAEINPROGRESS +#endif // EINPROGRESS + +#define ioctl ioctlsocket + +typedef S32 socklen_t; + +#elif defined ( TORQUE_OS_MAC ) || defined(TORQUE_OS_OSX) || defined(TORQUE_OS_IOS) || defined(TORQUE_OS_ANDROID) + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef sockaddr_in SOCKADDR_IN; +typedef sockaddr * PSOCKADDR; +typedef sockaddr SOCKADDR; +typedef in_addr IN_ADDR; +typedef int SOCKET; + +#define INVALID_SOCKET -1 +#define SOCKET_ERROR -1 + +#define closesocket close + +#elif defined( TORQUE_OS_LINUX ) + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef sockaddr_in SOCKADDR_IN; +typedef sockaddr_in6 SOCKADDR_IN6; +typedef sockaddr * PSOCKADDR; +typedef sockaddr SOCKADDR; +typedef in_addr IN_ADDR; +typedef in6_addr IN6_ADDR; +typedef int SOCKET; + +#define INVALID_SOCKET -1 +#define SOCKET_ERROR -1 + +#define closesocket close + + +S32 Poll(SOCKET fd, S32 eventMask, S32 timeoutMs) +{ + pollfd pfd; + S32 retVal; + pfd.fd = fd; + pfd.events = eventMask; + + retVal = poll(&pfd, 1, timeoutMs); + return retVal; + if (retVal <= 0) + return retVal; + else + return pfd.revents; +} + +#endif + +#if defined(TORQUE_USE_WINSOCK) +static const char* strerror_wsa( S32 code ) +{ + switch( code ) + { +#define E( name ) case name: return #name; + E( WSANOTINITIALISED ); + E( WSAENETDOWN ); + E( WSAEADDRINUSE ); + E( WSAEINPROGRESS ); + E( WSAEALREADY ); + E( WSAEADDRNOTAVAIL ); + E( WSAEAFNOSUPPORT ); + E( WSAEFAULT ); + E( WSAEINVAL ); + E( WSAEISCONN ); + E( WSAENETUNREACH ); + E( WSAEHOSTUNREACH ); + E( WSAENOBUFS ); + E( WSAENOTSOCK ); + E( WSAETIMEDOUT ); + E( WSAEWOULDBLOCK ); + E( WSAEACCES ); +#undef E + default: + return "Unknown"; + } +} +#endif + + + + +NetSocket NetSocket::INVALID = NetSocket::fromHandle(-1); + +template class ReservedSocketList +{ +public: + struct EntryType + { + T value; + bool used; + + EntryType() : value(-1), used(false) { ; } + + bool operator==(const EntryType &e1) + { + return value == e1.value && used == e1.used; + } + + bool operator!=(const EntryType &e1) + { + return !(value == e1.value && used == e1.used); + } + }; + + Vector mSocketList; + Mutex *mMutex; + + ReservedSocketList() + { + mMutex = new Mutex; + } + + ~ReservedSocketList() + { + delete mMutex; + } + + inline void modify() { Mutex::lockMutex(mMutex); } + inline void endModify() { Mutex::unlockMutex(mMutex); } + + NetSocket reserve(SOCKET reserveId = -1, bool doLock = true); + void remove(NetSocket socketToRemove, bool doLock = true); + + T activate(NetSocket socketToActivate, int family, bool useUDP, bool clearOnFail = false); + T resolve(NetSocket socketToResolve); +}; + +const SOCKET InvalidSocketHandle = -1; + +static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address); +static void IPSocket6ToNetAddress(const struct sockaddr_in6 *sockAddr, NetAddress *address); + +namespace PlatformNetState +{ + static S32 initCount = 0; + + static const S32 defaultPort = 28000; + static S32 netPort = 0; + + static NetSocket udpSocket = NetSocket::INVALID; + static NetSocket udp6Socket = NetSocket::INVALID; + static NetSocket multicast6Socket = NetSocket::INVALID; + + static ipv6_mreq multicast6Group; + + static ReservedSocketList smReservedSocketList; + + Net::Error getLastError() + { +#if defined(TORQUE_USE_WINSOCK) + S32 err = WSAGetLastError(); + switch (err) + { + case 0: + return Net::NoError; + case WSAEWOULDBLOCK: + return Net::WouldBlock; + default: + return Net::UnknownError; + } +#else + int theError = errno; + if (errno == EAGAIN) + return Net::WouldBlock; + if (errno == 0) + return Net::NoError; + if (errno == EINPROGRESS) + return Net::WouldBlock; + + return Net::UnknownError; +#endif + } + + S32 getDefaultGameProtocol() + { + // we turn off VDP in non-release builds because VDP does not support broadcast packets + // which are required for LAN queries (PC->Xbox connectivity). The wire protocol still + // uses the VDP packet structure, though. + S32 protocol = IPPROTO_UDP; + bool useVDP = false; +#ifdef TORQUE_DISABLE_PC_CONNECTIVITY + // Xbox uses a VDP (voice/data protocol) socket for networking + protocol = IPPROTO_VDP; + useVDP = true; +#endif + + return protocol; + } + + struct addrinfo* pickAddressByProtocol(struct addrinfo* addr, int protocol) + { + for (; addr != NULL; addr = addr->ai_next) + { + if (addr->ai_family == protocol) + return addr; + } + + return NULL; + } + + /// Extracts core address parts from an address string. Returns false if it's malformed. + bool extractAddressParts(const char *addressString, char outAddress[256], int &outPort, int &outFamily) + { + outPort = 0; + outFamily = AF_UNSPEC; + + if (!dStrnicmp(addressString, "ipx:", 4)) + // ipx support deprecated + return false; + + if (!dStrnicmp(addressString, "ip:", 3)) + { + addressString += 3; // eat off the ip: + outFamily = AF_INET; + } + else if (!dStrnicmp(addressString, "ip6:", 4)) + { + addressString += 4; // eat off the ip6: + outFamily = AF_INET6; + } + + if (strlen(addressString) > 255) + return false; + + char *portString = NULL; + + if (addressString[0] == '[') + { + // Must be ipv6 notation + dStrcpy(outAddress, addressString+1); + addressString = outAddress; + + portString = dStrchr(outAddress, ']'); + if (portString) + { + // Sort out the :port after the ] + *portString++ = '\0'; + if (*portString != ':') + { + portString = NULL; + } + else + { + *portString++ = '\0'; + } + } + + if (outFamily == AF_UNSPEC) + { + outFamily = AF_INET6; + } + } + else + { + dStrcpy(outAddress, addressString); + addressString = outAddress; + + // Check to see if we have multiple ":" which would indicate this is an ipv6 address + char* scan = outAddress; + int colonCount = 0; + while (*scan != '\0' && colonCount < 2) + { + if (*scan++ == ':') + colonCount++; + } + if (colonCount <= 1) + { + // either ipv4 or host + portString = dStrchr(outAddress, ':'); + + if (portString) + { + *portString++ = '\0'; + } + } + else if (outFamily == AF_UNSPEC) + { + // Must be ipv6 + outFamily = AF_INET6; + } + } + + if (portString) + { + outPort = dAtoi(portString); + } + + return true; + } + + Net::Error getSocketAddress(SOCKET socketFd, int requiredFamily, NetAddress *outAddress) + { + Net::Error error = Net::UnknownError; + + if (requiredFamily == AF_INET) + { + sockaddr_in ipAddr; + socklen_t len = sizeof(ipAddr); + if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) + { + IPSocketToNetAddress(&ipAddr, outAddress); + error = Net::NoError; + } + else + { + error = getLastError(); + } + } + else if (requiredFamily == AF_INET6) + { + sockaddr_in6 ipAddr; + socklen_t len = sizeof(ipAddr); + if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) + { + IPSocket6ToNetAddress(&ipAddr, outAddress); + error = Net::NoError; + } + else + { + error = getLastError(); + } + } + + return error; + } +}; + + + +template NetSocket ReservedSocketList::reserve(SOCKET reserveId, bool doLock) +{ + MutexHandle handle; + if (doLock) + { + handle.lock(mMutex, true); + } + + S32 idx = mSocketList.find_next(EntryType()); + if (idx == -1) + { + EntryType entry; + entry.value = reserveId; + entry.used = true; + mSocketList.push_back(entry); + return NetSocket::fromHandle(mSocketList.size() - 1); + } + else + { + EntryType &entry = mSocketList[idx]; + entry.used = true; + entry.value = reserveId; + } + + return NetSocket::fromHandle(idx); +} + +template void ReservedSocketList::remove(NetSocket socketToRemove, bool doLock) +{ + MutexHandle handle; + if (doLock) + { + handle.lock(mMutex, true); + } + + if ((U32)socketToRemove.getHandle() >= (U32)mSocketList.size()) + return; + + mSocketList[socketToRemove.getHandle()] = EntryType(); +} + +template T ReservedSocketList::activate(NetSocket socketToActivate, int family, bool useUDP, bool clearOnFail) +{ + MutexHandle h; + h.lock(mMutex, true); + + int typeID = useUDP ? SOCK_DGRAM : SOCK_STREAM; + int protocol = useUDP ? PlatformNetState::getDefaultGameProtocol() : 0; + + if ((U32)socketToActivate.getHandle() >= (U32)mSocketList.size()) + return -1; + + EntryType &entry = mSocketList[socketToActivate.getHandle()]; + if (!entry.used) + return -1; + + T socketFd = entry.value; + if (socketFd == -1) + { + socketFd = ::socket(family, typeID, protocol); + + if (socketFd == InvalidSocketHandle) + { + if (clearOnFail) + { + remove(socketToActivate, false); + } + return InvalidSocketHandle; + } + else + { + entry.used = true; + entry.value = socketFd; + return socketFd; + } + } + + return socketFd; +} + +template T ReservedSocketList::resolve(NetSocket socketToResolve) +{ + MutexHandle h; + h.lock(mMutex, true); + + if ((U32)socketToResolve.getHandle() >= (U32)mSocketList.size()) + return -1; + + EntryType &entry = mSocketList[socketToResolve.getHandle()]; + return entry.used ? entry.value : -1; +} + + +// Multicast stuff +bool Net::smMulticastEnabled = true; +// +// Protocol Stuff +bool Net::smIpv4Enabled = true; +bool Net::smIpv6Enabled = false; +// + +// the Socket structure helps us keep track of the +// above states +struct PolledSocket +{ + // local enum for socket states for polled sockets + enum SocketState + { + InvalidState, + Connected, + ConnectionPending, + Listening, + NameLookupRequired + }; + + PolledSocket() + { + fd = -1; + handleFd = NetSocket::INVALID; + state = InvalidState; + remoteAddr[0] = 0; + remotePort = -1; + } + + SOCKET fd; + NetSocket handleFd; + S32 state; + char remoteAddr[256]; + S32 remotePort; +}; + +// list of polled sockets +static Vector gPolledSockets( __FILE__, __LINE__ ); + +static PolledSocket* addPolledSocket(NetSocket handleFd, SOCKET fd, S32 state, + char* remoteAddr = NULL, S32 port = -1) +{ + PolledSocket* sock = new PolledSocket(); + sock->fd = fd; + sock->handleFd = handleFd; + sock->state = state; + if (remoteAddr) + dStrcpy(sock->remoteAddr, remoteAddr); + if (port != -1) + sock->remotePort = port; + gPolledSockets.push_back(sock); + return sock; +} + +bool netSocketWaitForWritable(NetSocket handleFd, S32 timeoutMs) +{ + fd_set writefds; + timeval timeout; + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + + FD_ZERO( &writefds ); + FD_SET( socketFd, &writefds ); + + timeout.tv_sec = timeoutMs / 1000; + timeout.tv_usec = ( timeoutMs % 1000 ) * 1000; + + if( select(socketFd + 1, NULL, &writefds, NULL, &timeout) > 0 ) + return true; + + return false; +} + +bool Net::init() +{ +#if defined(TORQUE_USE_WINSOCK) + if(!PlatformNetState::initCount) + { + WSADATA stWSAData; + AssertISV( !WSAStartup( 0x0101, &stWSAData ), "Net::init - failed to init WinSock!" ); + + //logprintf("Winsock initialization %s", success ? "succeeded." : "failed!"); + } +#endif + PlatformNetState::initCount++; + + + return(true); +} + +void Net::shutdown() +{ + + while (gPolledSockets.size() > 0) + { + if (gPolledSockets[0] == NULL) + gPolledSockets.erase(gPolledSockets.begin()); + else + closeConnectTo(gPolledSockets[0]->handleFd); + } + + closePort(); + PlatformNetState::initCount--; + + +#if defined(TORQUE_USE_WINSOCK) + if(!PlatformNetState::initCount) + { + WSACleanup(); + } +#endif +} + +// ipv4 version of name routines + +static void NetAddressToIPSocket(const NetAddress *address, struct sockaddr_in *sockAddr) +{ + dMemset(sockAddr, 0, sizeof(struct sockaddr_in)); + sockAddr->sin_family = AF_INET; + sockAddr->sin_port = htons(address->port); + #if defined(TORQUE_OS_BSD) || defined(TORQUE_OS_MAC) || defined(TORQUE_OS_OSX) || defined(TORQUE_OS_IOS) + sockAddr->sin_len = sizeof(struct sockaddr_in); + #endif + if (address->type == NetAddress::IPBroadcastAddress) + { + sockAddr->sin_addr.s_addr = htonl(INADDR_BROADCAST); + } + else + { + dMemcpy(&sockAddr->sin_addr, &address->address.ipv4.netNum[0], 4); + } +} + +static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) +{ + address->type = NetAddress::IPAddress; + address->port = ntohs(sockAddr->sin_port); + dMemcpy(&address->address.ipv4.netNum[0], &sockAddr->sin_addr, 4); +} + +// ipv6 version of name routines + +static void NetAddressToIPSocket6(const NetAddress *address, struct sockaddr_in6 *sockAddr) +{ + dMemset(sockAddr, 0, sizeof(struct sockaddr_in6)); +#ifdef SIN6_LEN + sockAddr->sin6_len = sizeof(struct sockaddr_in6); +#endif + sockAddr->sin6_family = AF_INET6; + sockAddr->sin6_port = ntohs(address->port); + + if (address->type == NetAddress::IPV6MulticastAddress) + { + sockAddr->sin6_addr = PlatformNetState::multicast6Group.ipv6mr_multiaddr; + sockAddr->sin6_scope_id = PlatformNetState::multicast6Group.ipv6mr_interface; + } + else + { + sockAddr->sin6_flowinfo = address->address.ipv6.netFlow; + sockAddr->sin6_scope_id = address->address.ipv6.netScope; + dMemcpy(&sockAddr->sin6_addr, address->address.ipv6.netNum, sizeof(address->address.ipv6.netNum)); + } +} + +static void IPSocket6ToNetAddress(const struct sockaddr_in6 *sockAddr, NetAddress *address) +{ + address->type = NetAddress::IPV6Address; + address->port = ntohs(sockAddr->sin6_port); + dMemcpy(address->address.ipv6.netNum, &sockAddr->sin6_addr, sizeof(address->address.ipv6.netNum)); + address->address.ipv6.netFlow = sockAddr->sin6_flowinfo; + address->address.ipv6.netScope = sockAddr->sin6_scope_id; +} + +// + +NetSocket Net::openListenPort(U16 port, NetAddress::Type addressType) +{ +#ifdef TORQUE_ALLOW_JOURNALING + if(Game->isJournalReading()) + { + U32 ret; + Game->journalRead(&ret); + return NetSocket::fromHandle(ret); + } +#endif + + Net::Error error = NoError; + NetAddress address; + if (Net::getListenAddress(addressType, &address) != Net::NoError) + error = Net::WrongProtocolType; + + NetSocket handleFd = NetSocket::INVALID; + SOCKET sockId = InvalidSocketHandle; + + if (error == NoError) + { + handleFd = openSocket(); + sockId = PlatformNetState::smReservedSocketList.activate(handleFd, address.type == NetAddress::IPAddress ? AF_INET : AF_INET6, false, true); + } + + if (error == NoError && (handleFd == NetSocket::INVALID || sockId == InvalidSocketHandle)) + { + Con::errorf("Unable to open listen socket: %s", strerror(errno)); + error = NotASocket; + handleFd = NetSocket::INVALID; + } + + if (error == NoError) + { + address.port = port; + error = bindAddress(address, handleFd, false); + if (error != NoError) + { + Con::errorf("Unable to bind port %d: %s", port, strerror(errno)); + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } + } + + if (error == NoError) + { + error = listen(handleFd, 4); + if (error != NoError) + { + Con::errorf("Unable to listen on port %d: %s", port, strerror(errno)); + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } + } + + if (error == NoError) + { + setBlocking(handleFd, false); + addPolledSocket(handleFd, sockId, PolledSocket::Listening); + } + +#ifdef TORQUE_ALLOW_JOURNALING + if(Game->isJournalWriting()) + Game->journalWrite(U32(handleFd.getHandle())); +#endif + return handleFd; +} + +NetSocket Net::openConnectTo(const char *addressString) +{ +#ifdef TORQUE_ALLOW_JOURNALING + if (Game->isJournalReading()) + { + U32 ret; + Game->journalRead(&ret); + return NetSocket::fromHandle(ret); + } +#endif + NetAddress address; + NetSocket handleFd = NetSocket::INVALID; + Net::Error error = NoError; + + error = Net::stringToAddress(addressString, &address, false); + + if (error == NoError && address.type != NetAddress::IPAddress && address.type != NetAddress::IPV6Address) + { + error = Net::WrongProtocolType; + } + + // Open socket + if (error == NoError || error == NeedHostLookup) + { + handleFd = openSocket(); + } + + // Attempt to connect or queue a lookup + if (error == NoError && address.type == NetAddress::IPAddress) + { + sockaddr_in ipAddr; + NetAddressToIPSocket(&address, &ipAddr); + SOCKET socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET, false, true); + if (socketFd != InvalidSocketHandle) + { + setBlocking(handleFd, false); + if (::connect(socketFd, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1) + { + Net::Error err = PlatformNetState::getLastError(); + if (err != Net::WouldBlock) + { + Con::errorf("Error connecting to %s: %u", + addressString, err); + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } + } + } + else + { + PlatformNetState::smReservedSocketList.remove(handleFd); + handleFd = NetSocket::INVALID; + } + + if (handleFd != NetSocket::INVALID) + { + // add this socket to our list of polled sockets + addPolledSocket(handleFd, socketFd, PolledSocket::ConnectionPending); + } + } + else if (error == NoError && address.type == NetAddress::IPV6Address) + { + sockaddr_in6 ipAddr6; + NetAddressToIPSocket6(&address, &ipAddr6); + SOCKET socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET6, false, true); + if (socketFd != InvalidSocketHandle) + { + setBlocking(handleFd, false); + if (::connect(socketFd, (struct sockaddr *)&ipAddr6, sizeof(ipAddr6)) == -1) + { + Net::Error err = PlatformNetState::getLastError(); + if (err != Net::WouldBlock) + { + Con::errorf("Error connecting to %s: %u", + addressString, err); + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } + } + } + else + { + PlatformNetState::smReservedSocketList.remove(handleFd); + handleFd = NetSocket::INVALID; + } + + if (handleFd != NetSocket::INVALID) + { + // add this socket to our list of polled sockets + addPolledSocket(handleFd, socketFd, PolledSocket::ConnectionPending); + } + } + else if (error == Net::NeedHostLookup) + { + // need to do an asynchronous name lookup. first, add the socket + // to the polled list + char addr[256]; + int port = 0; + int actualFamily = AF_UNSPEC; + if (PlatformNetState::extractAddressParts(addressString, addr, port, actualFamily)) + { + addPolledSocket(handleFd, InvalidSocketHandle, PolledSocket::NameLookupRequired, addr, port); + // queue the lookup + gNetAsync.queueLookup(addressString, handleFd); + } + else + { + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } + } + else + { + closeSocket(handleFd); + handleFd = NetSocket::INVALID; + } +#ifdef TORQUE_ALLOW_JOURNALING + if (Game->isJournalWriting()) + Game->journalWrite(U32(handleFd.getHandle())); +#endif + return handleFd; +} + +void Net::closeConnectTo(NetSocket handleFd) +{ +#ifdef TORQUE_ALLOW_JOURNALING + if(Game->isJournalReading()) + return; +#endif + // if this socket is in the list of polled sockets, remove it + for (S32 i = 0; i < gPolledSockets.size(); ++i) + { + if (gPolledSockets[i] && gPolledSockets[i]->handleFd == handleFd) + { + delete gPolledSockets[i]; + gPolledSockets[i] = NULL; + break; + } + } + + closeSocket(handleFd); +} + +Net::Error Net::sendtoSocket(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBufferWritten) +{ +#ifdef TORQUE_ALLOW_JOURNALING + if(Game->isJournalReading()) + { + U32 e; + U32 outBytes; + Game->journalRead(&e); + Game->journalRead(&outBytes); + if (outBufferWritten) + *outBufferWritten = outBytes; + + return (Net::Error) e; + } +#endif + S32 outBytes = 0; + Net::Error e = send(handleFd, buffer, bufferSize, &outBytes); +#ifdef TORQUE_ALLOW_JOURNALING + if (Game->isJournalWriting()) + { + Game->journalWrite(U32(e)); + Game->journalWrite(outBytes); + } +#endif + if (outBufferWritten) + *outBufferWritten = outBytes; + + return e; +} + +bool Net::openPort(S32 port, bool doBind) +{ + if (PlatformNetState::udpSocket != NetSocket::INVALID) + { + closeSocket(PlatformNetState::udpSocket); + PlatformNetState::udpSocket = NetSocket::INVALID; + } + if (PlatformNetState::udp6Socket != NetSocket::INVALID) + { + closeSocket(PlatformNetState::udp6Socket); + PlatformNetState::udp6Socket = NetSocket::INVALID; + } + + // Update prefs + Net::smMulticastEnabled = Con::getBoolVariable("pref::Net::Multicast6Enabled", true); + Net::smIpv4Enabled = Con::getBoolVariable("pref::Net::IPV4Enabled", true); + Net::smIpv6Enabled = Con::getBoolVariable("pref::Net::IPV6Enabled", false); + + // we turn off VDP in non-release builds because VDP does not support broadcast packets + // which are required for LAN queries (PC->Xbox connectivity). The wire protocol still + // uses the VDP packet structure, though. + S32 protocol = PlatformNetState::getDefaultGameProtocol(); + + SOCKET socketFd = InvalidSocketHandle; + NetAddress address; + NetAddress listenAddress; + char listenAddressStr[256]; + + if (Net::smIpv4Enabled) + { + if (Net::getListenAddress(NetAddress::IPAddress, &address) == Net::NoError) + { + address.port = port; + socketFd = ::socket(AF_INET, SOCK_DGRAM, protocol); + + if (socketFd != InvalidSocketHandle) + { + PlatformNetState::udpSocket = PlatformNetState::smReservedSocketList.reserve(socketFd); + Net::Error error = NoError; + if (doBind) + { + error = bindAddress(address, PlatformNetState::udpSocket, true); + } + + if (error == NoError) + error = setBufferSize(PlatformNetState::udpSocket, 32768 * 8); + +#ifndef TORQUE_DISABLE_PC_CONNECTIVITY + if (error == NoError) + error = setBroadcast(PlatformNetState::udpSocket, true); +#endif + + if (error == NoError) + error = setBlocking(PlatformNetState::udpSocket, false); + + if (error == NoError) + { + error = PlatformNetState::getSocketAddress(socketFd, AF_INET, &listenAddress); + if (error == NoError) + { + Net::addressToString(&listenAddress, listenAddressStr); + Con::printf("UDP initialized on ipv4 %s", listenAddressStr); + } + } + + if (error != NoError) + { + closeSocket(PlatformNetState::udpSocket); + PlatformNetState::udpSocket = NetSocket::INVALID; + Con::printf("Unable to initialize UDP on ipv4 - error %d", error); + } + } + } + else + { + Con::errorf("Unable to initialize UDP on ipv4 - invalid address."); + PlatformNetState::udpSocket = NetSocket::INVALID; + } + } + + if (Net::smIpv6Enabled) + { + if (Net::getListenAddress(NetAddress::IPV6Address, &address) == Net::NoError) + { + address.port = port; + socketFd = ::socket(AF_INET6, SOCK_DGRAM, protocol); + + if (socketFd != InvalidSocketHandle) + { + PlatformNetState::udp6Socket = PlatformNetState::smReservedSocketList.reserve(socketFd); + + Net::Error error = NoError; + + int v = 1; + setsockopt(socketFd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&v, sizeof(v)); + PlatformNetState::getLastError(); + + if (doBind) + { + error = bindAddress(address, PlatformNetState::udp6Socket, true); + } + + if (error == NoError) + error = setBufferSize(PlatformNetState::udp6Socket, 32768 * 8); + + if (error == NoError) + error = setBlocking(PlatformNetState::udp6Socket, false); + + if (error == NoError) + { + error = PlatformNetState::getSocketAddress(socketFd, AF_INET6, &listenAddress); + if (error == NoError) + { + Net::addressToString(&listenAddress, listenAddressStr); + Con::printf("UDP initialized on ipv6 %s", listenAddressStr); + } + } + + if (error != NoError) + { + closeSocket(PlatformNetState::udp6Socket); + PlatformNetState::udp6Socket = NetSocket::INVALID; + Con::printf("Unable to initialize UDP on ipv6 - error %d", error); + } + + if (Net::smMulticastEnabled && doBind) + { + Net::enableMulticast(); + } + else + { + Net::disableMulticast(); + } + } + } + } + + PlatformNetState::netPort = port; + + return PlatformNetState::udpSocket != NetSocket::INVALID || PlatformNetState::udp6Socket != NetSocket::INVALID; +} + +NetSocket Net::getPort() +{ + return PlatformNetState::udpSocket; +} + +void Net::closePort() +{ + if (PlatformNetState::udpSocket != NetSocket::INVALID) + closeSocket(PlatformNetState::udpSocket); + if (PlatformNetState::udp6Socket != NetSocket::INVALID) + closeSocket(PlatformNetState::udp6Socket); +} + +Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) +{ +#ifdef TORQUE_ALLOW_JOURNALING + if(Game->isJournalReading()) + return NoError; +#endif + SOCKET socketFd; + + if(address->type == NetAddress::IPAddress || address->type == NetAddress::IPBroadcastAddress) + { + socketFd = PlatformNetState::smReservedSocketList.resolve(PlatformNetState::udpSocket); + if (socketFd != InvalidSocketHandle) + { + sockaddr_in ipAddr; + NetAddressToIPSocket(address, &ipAddr); + + if (::sendto(socketFd, (const char*)buffer, bufferSize, 0, + (sockaddr *)&ipAddr, sizeof(sockaddr_in)) == SOCKET_ERROR) + return PlatformNetState::getLastError(); + else + return NoError; + } + else + { + return NotASocket; + } + } + else if (address->type == NetAddress::IPV6Address || address->type == NetAddress::IPV6MulticastAddress) + { + socketFd = PlatformNetState::smReservedSocketList.resolve(address->type == NetAddress::IPV6MulticastAddress ? PlatformNetState::multicast6Socket : PlatformNetState::udp6Socket); + + if (socketFd != InvalidSocketHandle) + { + sockaddr_in6 ipAddr; + NetAddressToIPSocket6(address, &ipAddr); + if (::sendto(socketFd, (const char*)buffer, bufferSize, 0, + (struct sockaddr *) &ipAddr, sizeof(sockaddr_in6)) == SOCKET_ERROR) + return PlatformNetState::getLastError(); + else + return NoError; + } + else + { + return NotASocket; + } + } + + return WrongProtocolType; +} + +void Net::process() +{ + // Process listening sockets + processListenSocket(PlatformNetState::udpSocket); + processListenSocket(PlatformNetState::udp6Socket); + + // process the polled sockets. This blob of code performs functions + // similar to WinsockProc in winNet.cc + + if (gPolledSockets.size() == 0) + return; + + static ConnectedNotifyEvent notifyEvent; + static ConnectedAcceptEvent acceptEvent; + static ConnectedReceiveEvent cReceiveEvent; + + S32 optval; + socklen_t optlen = sizeof(S32); + S32 bytesRead; + Net::Error err; + bool removeSock = false; + PolledSocket *currentSock = NULL; + NetSocket incomingHandleFd = NetSocket::INVALID; + NetAddress out_h_addr; + S32 out_h_length = 0; + NetSocket removeSockHandle; + + for (S32 i = 0; i < gPolledSockets.size(); + /* no increment, this is done at end of loop body */) + { + removeSock = false; + currentSock = gPolledSockets[i]; + + // Cleanup if we've removed it + if (currentSock == NULL) + { + gPolledSockets.erase(i); + continue; + } + + switch (currentSock->state) + { + case PolledSocket::InvalidState: + Con::errorf("Error, InvalidState socket in polled sockets list"); + break; + case PolledSocket::ConnectionPending: + // see if it is now connected + if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR, + (char*)&optval, &optlen) == -1) + { + Con::errorf("Error getting socket options: %s", strerror(errno)); + + removeSock = true; + removeSockHandle = currentSock->handleFd; + + notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + } + else + { + if (optval == EINPROGRESS) + // still connecting... + break; + + if (optval == 0) + { + // poll for writable status to be sure we're connected. + bool ready = netSocketWaitForWritable(currentSock->handleFd,0); + if(!ready) + break; + + currentSock->state = PolledSocket::Connected; + notifyEvent.state = ConnectedNotifyEvent::Connected; + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + } + else + { + // some kind of error + Con::errorf("Error connecting: %s", strerror(errno)); + + removeSock = true; + removeSockHandle = currentSock->handleFd; + + notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + } + } + break; + case PolledSocket::Connected: + + // try to get some data + bytesRead = 0; + err = Net::recv(currentSock->handleFd, (U8*)cReceiveEvent.data, MaxPacketDataSize, &bytesRead); + if(err == Net::NoError) + { + if (bytesRead > 0) + { + // got some data, post it + cReceiveEvent.size = ConnectedReceiveEventHeaderSize + + bytesRead; + cReceiveEvent.tag = currentSock->handleFd; + Game->postEvent(cReceiveEvent); + } + else + { + // ack! this shouldn't happen + if (bytesRead < 0) + Con::errorf("Unexpected error on socket: %s", strerror(errno)); + + removeSock = true; + removeSockHandle = currentSock->handleFd; + + // zero bytes read means EOF + notifyEvent.tag = currentSock->handleFd; + notifyEvent.state = ConnectedNotifyEvent::Disconnected; + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + } + } + else if (err != Net::NoError && err != Net::WouldBlock) + { + Con::errorf("Error reading from socket: %s", strerror(errno)); + + removeSock = true; + removeSockHandle = currentSock->handleFd; + + notifyEvent.state = ConnectedNotifyEvent::Disconnected; + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + } + break; + case PolledSocket::NameLookupRequired: + U32 newState; + + // is the lookup complete? + if (!gNetAsync.checkLookup( + currentSock->handleFd, &out_h_addr, &out_h_length, + sizeof(out_h_addr))) + break; + + if (out_h_length == -1) + { + Con::errorf("DNS lookup failed: %s", currentSock->remoteAddr); + notifyEvent.state = ConnectedNotifyEvent::DNSFailed; + newState = Net::DNSFailed; + removeSock = true; + removeSockHandle = currentSock->handleFd; + } + else + { + // try to connect + out_h_addr.port = currentSock->remotePort; + const sockaddr *ai_addr = NULL; + int ai_addrlen = 0; + sockaddr_in socketAddress; + sockaddr_in6 socketAddress6; + + if (out_h_addr.type == NetAddress::IPAddress) + { + ai_addr = (const sockaddr*)&socketAddress; + ai_addrlen = sizeof(socketAddress); + NetAddressToIPSocket(&out_h_addr, &socketAddress); + + currentSock->fd = PlatformNetState::smReservedSocketList.activate(currentSock->handleFd, AF_INET, false); + setBlocking(currentSock->handleFd, false); + +#ifdef TORQUE_DEBUG_LOOKUPS + char addrString[256]; + NetAddress addr; + IPSocketToNetAddress(&socketAddress, &addr); + Net::addressToString(&addr, addrString); + Con::printf("DNS: lookup resolved to %s", addrString); +#endif + } + else if (out_h_addr.type == NetAddress::IPV6Address) + { + ai_addr = (const sockaddr*)&socketAddress6; + ai_addrlen = sizeof(socketAddress6); + NetAddressToIPSocket6(&out_h_addr, &socketAddress6); + + currentSock->fd = PlatformNetState::smReservedSocketList.activate(currentSock->handleFd, AF_INET6, false); + setBlocking(currentSock->handleFd, false); + +#ifdef TORQUE_DEBUG_LOOKUPS + char addrString[256]; + NetAddress addr; + IPSocket6ToNetAddress(&socketAddress6, &addr); + Net::addressToString(&addr, addrString); + Con::printf("DNS: lookup resolved to %s", addrString); +#endif + } + else + { + Con::errorf("Error connecting to %s: Invalid Protocol", + currentSock->remoteAddr); + notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; + newState = Net::ConnectFailed; + removeSock = true; + removeSockHandle = currentSock->handleFd; + } + + if (ai_addr) + { + if (::connect(currentSock->fd, ai_addr, + ai_addrlen) == -1) + { + err = PlatformNetState::getLastError(); + if (err != Net::WouldBlock) + { + Con::errorf("Error connecting to %s: %u", + currentSock->remoteAddr, err); + notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; + newState = Net::ConnectFailed; + removeSock = true; + removeSockHandle = currentSock->handleFd; + } + else + { + notifyEvent.state = ConnectedNotifyEvent::DNSResolved; + newState = Net::DNSResolved; + currentSock->state = PolledSocket::ConnectionPending; + } + } + else + { + notifyEvent.state = ConnectedNotifyEvent::Connected; + newState = Net::Connected; + currentSock->state = Connected; + } + } + } + notifyEvent.tag = currentSock->handleFd; + Game->postEvent(notifyEvent); + break; + case PolledSocket::Listening: + + incomingHandleFd = Net::accept(currentSock->handleFd, &acceptEvent.address); + if(incomingHandleFd != NetSocket::INVALID) + { + setBlocking(incomingHandleFd, false); + addPolledSocket(incomingHandleFd, PlatformNetState::smReservedSocketList.resolve(incomingHandleFd), Connected); + acceptEvent.portTag = currentSock->handleFd; + acceptEvent.connectionTag = incomingHandleFd; + Game->postEvent(acceptEvent); + } + break; + } + + // only increment index if we're not removing the connection, since + // the removal will shift the indices down by one + if (removeSock) + closeConnectTo(removeSockHandle); + else + i++; + } +} + +void Net::processListenSocket(NetSocket socketHandle) +{ + if (socketHandle == NetSocket::INVALID) + return; + PacketReceiveEvent receiveEvent; + + sockaddr_storage sa; + sa.ss_family = AF_UNSPEC; + + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(socketHandle); + + for (;;) + { + socklen_t addrLen = sizeof(sa); + S32 bytesRead = -1; + + if (socketHandle != NetSocket::INVALID) + bytesRead = ::recvfrom(socketFd, (char *)receiveEvent.data, Net::MaxPacketDataSize, 0, (struct sockaddr*)&sa, &addrLen); + + if (bytesRead == -1) + break; + + if (sa.ss_family == AF_INET) + IPSocketToNetAddress((sockaddr_in *)&sa, &receiveEvent.sourceAddress); + else if (sa.ss_family == AF_INET6) + IPSocket6ToNetAddress((sockaddr_in6 *)&sa, &receiveEvent.sourceAddress); + else + continue; + + if (bytesRead <= 0) + continue; + + if (receiveEvent.sourceAddress.type == NetAddress::IPAddress && + receiveEvent.sourceAddress.address.ipv4.netNum[0] == 127 && + receiveEvent.sourceAddress.address.ipv4.netNum[1] == 0 && + receiveEvent.sourceAddress.address.ipv4.netNum[2] == 0 && + receiveEvent.sourceAddress.address.ipv4.netNum[3] == 1 && + receiveEvent.sourceAddress.port == PlatformNetState::netPort) + continue; + + receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; + Game->postEvent(receiveEvent); + } +} + +NetSocket Net::openSocket() +{ + return PlatformNetState::smReservedSocketList.reserve(); +} + +Net::Error Net::closeSocket(NetSocket handleFd) +{ + if(handleFd != NetSocket::INVALID) + { + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + PlatformNetState::smReservedSocketList.remove(handleFd); + + if(!::closesocket(socketFd)) + return NoError; + else + return PlatformNetState::getLastError(); + } + else + return NotASocket; +} + +Net::Error Net::connect(NetSocket handleFd, const NetAddress *address) +{ + if(!(address->type == NetAddress::IPAddress || address->type == NetAddress::IPV6Address)) + return WrongProtocolType; + + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + + if (address->type == NetAddress::IPAddress) + { + sockaddr_in socketAddress; + NetAddressToIPSocket(address, &socketAddress); + + if (socketFd == InvalidSocketHandle) + { + socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET, false); + } + + if (!::connect(socketFd, (struct sockaddr *) &socketAddress, sizeof(socketAddress))) + return NoError; + } + else if (address->type == NetAddress::IPV6Address) + { + sockaddr_in6 socketAddress; + NetAddressToIPSocket6(address, &socketAddress); + + if (socketFd == InvalidSocketHandle) + { + socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET6, false); + } + + if (!::connect(socketFd, (struct sockaddr *) &socketAddress, sizeof(socketAddress))) + return NoError; + } + + return PlatformNetState::getLastError(); +} + +Net::Error Net::listen(NetSocket handleFd, S32 backlog) +{ + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + + if(!::listen(socketFd, backlog)) + return NoError; + return PlatformNetState::getLastError(); +} + +NetSocket Net::accept(NetSocket handleFd, NetAddress *remoteAddress) +{ + sockaddr_storage addr; + socklen_t addrLen = sizeof(addr); + + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NetSocket::INVALID; + + SOCKET acceptedSocketFd = ::accept(socketFd, (sockaddr *)&addr, &addrLen); + if (acceptedSocketFd != InvalidSocketHandle) + { + if (addr.ss_family == AF_INET) + { + // ipv4 + IPSocketToNetAddress(((struct sockaddr_in*)&addr), remoteAddress); + } + else if (addr.ss_family == AF_INET6) + { + // ipv6 + IPSocket6ToNetAddress(((struct sockaddr_in6*)&addr), remoteAddress); + } + + NetSocket newHandleFd = PlatformNetState::smReservedSocketList.reserve(acceptedSocketFd); + return newHandleFd; + } + + return NetSocket::INVALID; +} + +Net::Error Net::bindAddress(const NetAddress &address, NetSocket handleFd, bool useUDP) +{ + int error = 0; + sockaddr_storage socketAddress; + + dMemset(&socketAddress, '\0', sizeof(socketAddress)); + + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + { + if (handleFd.getHandle() == -1) + return NotASocket; + } + + if (address.type == NetAddress::IPAddress) + { + socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET, useUDP); + NetAddressToIPSocket(&address, (struct sockaddr_in*)&socketAddress); + error = ::bind(socketFd, (struct sockaddr*)&socketAddress, sizeof(sockaddr_in)); + } + else if (address.type == NetAddress::IPV6Address) + { + socketFd = PlatformNetState::smReservedSocketList.activate(handleFd, AF_INET6, useUDP); + NetAddressToIPSocket6(&address, (struct sockaddr_in6*)&socketAddress); + error = ::bind(socketFd, (struct sockaddr*)&socketAddress, sizeof(sockaddr_in6)); + } + + if (!error) + return NoError; + return PlatformNetState::getLastError(); +} + +Net::Error Net::setBufferSize(NetSocket handleFd, S32 bufferSize) +{ + S32 error; + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + + error = ::setsockopt(socketFd, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); + if(!error) + error = ::setsockopt(socketFd, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); + if(!error) + return NoError; + return PlatformNetState::getLastError(); +} + +Net::Error Net::setBroadcast(NetSocket handleFd, bool broadcast) +{ + S32 bc = broadcast; + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + S32 error = ::setsockopt(socketFd, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); + if(!error) + return NoError; + return PlatformNetState::getLastError(); +} + +Net::Error Net::setBlocking(NetSocket handleFd, bool blockingIO) +{ + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + + unsigned long notblock = !blockingIO; + S32 error = ioctl(socketFd, FIONBIO, ¬block); + if(!error) + return NoError; + return PlatformNetState::getLastError(); +} + +Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults) +{ + if (type == NetAddress::IPAddress) + { + const char* serverIP = forceDefaults ? NULL : Con::getVariable("pref::Net::BindAddress"); + if (!serverIP || serverIP[0] == '\0') + { + address->type = type; + address->port = 0; + *((U32*)address->address.ipv4.netNum) = INADDR_ANY; + return Net::NoError; + } + else + { + return Net::stringToAddress(serverIP, address, false); + } + } + else if (type == NetAddress::IPBroadcastAddress) + { + address->type = type; + address->port = 0; + *((U32*)address->address.ipv4.netNum) = INADDR_BROADCAST; + return Net::NoError; + } + else if (type == NetAddress::IPV6Address) + { + const char* serverIP6 = forceDefaults ? NULL : Con::getVariable("pref::Net::BindAddress6"); + if (!serverIP6 || serverIP6[0] == '\0') + { + sockaddr_in6 addr; + dMemset(&addr, '\0', sizeof(addr)); + + addr.sin6_port = 0; + addr.sin6_addr = in6addr_any; + + IPSocket6ToNetAddress(&addr, address); + return Net::NoError; + } + else + { + return Net::stringToAddress(serverIP6, address, false); + } + } + else if (type == NetAddress::IPV6MulticastAddress) + { + const char* multicastAddressValue = forceDefaults ? NULL : Con::getVariable("pref::Net::Multicast6Address"); + if (!multicastAddressValue || multicastAddressValue[0] == '\0') + { + multicastAddressValue = TORQUE_NET_DEFAULT_MULTICAST_ADDRESS; + } + + return Net::stringToAddress(multicastAddressValue, address, false); + } + else + { + return Net::WrongProtocolType; + } +} + +void Net::getIdealListenAddress(NetAddress *address) +{ + dMemset(address, '\0', sizeof(NetAddress)); + + if (Net::smIpv6Enabled) + { + if (Net::getListenAddress(NetAddress::IPV6Address, address) == NeedHostLookup) + { + Net::getListenAddress(NetAddress::IPV6Address, address, true); + } + } + else + { + if (Net::getListenAddress(NetAddress::IPAddress, address) == NeedHostLookup) + { + Net::getListenAddress(NetAddress::IPAddress, address, true); + } + } +} + +Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBytesWritten) +{ + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + +#if defined( TORQUE_OS_LINUX ) + // Poll for write status. this blocks. should really + // do this in a separate thread or set it up so that the data can + // get queued and sent later + // JMQTODO + Poll(socketFd, POLLOUT, 10000); +#endif + + errno = 0; + S32 bytesWritten = ::send(socketFd, (const char*)buffer, bufferSize, 0); + + if (outBytesWritten) + { + *outBytesWritten = outBytesWritten < (void *)0 ? 0 : bytesWritten; + } + + return PlatformNetState::getLastError(); +} + +Net::Error Net::recv(NetSocket handleFd, U8 *buffer, S32 bufferSize, S32 *bytesRead) +{ + SOCKET socketFd = PlatformNetState::smReservedSocketList.resolve(handleFd); + if (socketFd == InvalidSocketHandle) + return NotASocket; + + *bytesRead = ::recv(socketFd, (char*)buffer, bufferSize, 0); + if(*bytesRead == -1) + return PlatformNetState::getLastError(); + return NoError; +} + +bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) +{ + return a1->isSameAddressAndPort(*a2); +} + +Net::Error Net::stringToAddress(const char *addressString, NetAddress *address, bool hostLookup, int requiredFamily) +{ + char addr[256]; + int port = 0; + int actualFamily = AF_UNSPEC; + if (!PlatformNetState::extractAddressParts(addressString, addr, port, actualFamily)) + { + return WrongProtocolType; + } + + // Make sure family matches (in cast we have IP: stuff in address) + if (requiredFamily != AF_UNSPEC && actualFamily != AF_UNSPEC && (actualFamily != requiredFamily)) + { + return WrongProtocolType; + } + + if (actualFamily == AF_UNSPEC) + { + actualFamily = requiredFamily; + } + + addressString = addr; + dMemset(address, '\0', sizeof(NetAddress)); + + if (!dStricmp(addressString, "broadcast")) + { + address->type = NetAddress::IPBroadcastAddress; + if (!(actualFamily == AF_UNSPEC || actualFamily == AF_INET)) + return WrongProtocolType; + + if (port != 0) + address->port = port; + else + address->port = PlatformNetState::defaultPort; + } + else if (!dStricmp(addressString, "multicast")) + { + address->type = NetAddress::IPV6MulticastAddress; + if (!(actualFamily == AF_UNSPEC || actualFamily == AF_INET6)) + return WrongProtocolType; + + if (port != 0) + address->port = port; + else + address->port = PlatformNetState::defaultPort; + } + else + { + sockaddr_in ipAddr; + sockaddr_in6 ipAddr6; + + dMemset(&ipAddr, 0, sizeof(ipAddr)); + dMemset(&ipAddr6, 0, sizeof(ipAddr6)); + + bool hasInterface = dStrchr(addressString, '%') != NULL; // if we have an interface, best use getaddrinfo to parse + + // Check if we've got a simple ipv4 / ipv6 + + if (inet_pton(AF_INET, addressString, &ipAddr.sin_addr) == 1) + { + if (!(actualFamily == AF_UNSPEC || actualFamily == AF_INET)) + return WrongProtocolType; + IPSocketToNetAddress(((struct sockaddr_in*)&ipAddr), address); + + if (port != 0) + address->port = port; + else + address->port = PlatformNetState::defaultPort; + + return NoError; + } + else if (!hasInterface && inet_pton(AF_INET6, addressString, &ipAddr6.sin6_addr) == 1) + { + if (!(actualFamily == AF_UNSPEC || actualFamily == AF_INET6)) + return WrongProtocolType; + IPSocket6ToNetAddress(((struct sockaddr_in6*)&ipAddr6), address); + + if (port != 0) + address->port = port; + else + address->port = PlatformNetState::defaultPort; + + return NoError; + } + else + { + if (!hostLookup && !hasInterface) + return NeedHostLookup; + + struct addrinfo hint, *res = NULL; + dMemset(&hint, 0, sizeof(hint)); + hint.ai_family = actualFamily; + hint.ai_flags = hostLookup ? 0 : AI_NUMERICHOST; + + if (getaddrinfo(addressString, NULL, &hint, &res) == 0) + { + if (actualFamily != AF_UNSPEC) + { + // Prefer desired protocol + res = PlatformNetState::pickAddressByProtocol(res, actualFamily); + } + + if (res && res->ai_family == AF_INET) + { + // ipv4 + IPSocketToNetAddress(((struct sockaddr_in*)res->ai_addr), address); + } + else if (res && res->ai_family == AF_INET6) + { + // ipv6 + IPSocket6ToNetAddress(((struct sockaddr_in6*)res->ai_addr), address); + } + else + { + // unknown + return UnknownError; + } + + if (port != 0) + address->port = port; + else + address->port = PlatformNetState::defaultPort; + } + } + } + + return NoError; +} + +void Net::addressToString(const NetAddress *address, char addressString[256]) +{ + if(address->type == NetAddress::IPAddress || address->type == NetAddress::IPBroadcastAddress) + { + sockaddr_in ipAddr; + NetAddressToIPSocket(address, &ipAddr); + + if (ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST) || address->type == NetAddress::IPBroadcastAddress) + { + if (ipAddr.sin_port == 0) + dSprintf(addressString, 256, "IP:Broadcast"); + else + dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); + } + else + { + char buffer[256]; + buffer[0] = '\0'; + sockaddr_in ipAddr; + NetAddressToIPSocket(address, &ipAddr); + inet_ntop(AF_INET, &(ipAddr.sin_addr), buffer, sizeof(buffer)); + if (ipAddr.sin_port == 0) + dSprintf(addressString, 256, "IP:%s", buffer); + else + dSprintf(addressString, 256, "IP:%s:%i", buffer, ntohs(ipAddr.sin_port)); + } + } + else if (address->type == NetAddress::IPV6Address) + { + char buffer[256]; + buffer[0] = '\0'; + sockaddr_in6 ipAddr; + NetAddressToIPSocket6(address, &ipAddr); + inet_ntop(AF_INET6, &(ipAddr.sin6_addr), buffer, sizeof(buffer)); + if (ipAddr.sin6_port == 0) + dSprintf(addressString, 256, "IP6:%s", buffer); + else + dSprintf(addressString, 256, "IP6:[%s]:%i", buffer, ntohs(ipAddr.sin6_port)); + } + else if (address->type == NetAddress::IPV6MulticastAddress) + { + if (address->port == 0) + dSprintf(addressString, 256, "IP6:Multicast"); + else + dSprintf(addressString, 256, "IP6:Multicast:%d", address->port); + } + else + { + *addressString = 0; + return; + } +} + +void Net::enableMulticast() +{ + SOCKET socketFd; + + if (Net::smIpv6Enabled) + { + socketFd = PlatformNetState::smReservedSocketList.resolve(PlatformNetState::udp6Socket); + + if (socketFd != InvalidSocketHandle) + { + PlatformNetState::multicast6Socket = PlatformNetState::udp6Socket; + + Net::Error error = NoError; + + if (error == NoError) + { + unsigned long multicastTTL = 1; + + if (setsockopt(socketFd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + (char*)&multicastTTL, sizeof(multicastTTL)) < 0) + { + error = PlatformNetState::getLastError(); + } + } + + // Find multicast to bind to... + + NetAddress multicastAddress; + sockaddr_in6 multicastSocketAddress; + + const char *multicastAddressValue = Con::getVariable("pref::Net::Multicast6Address"); + if (!multicastAddressValue || multicastAddressValue[0] == '\0') + { + multicastAddressValue = TORQUE_NET_DEFAULT_MULTICAST_ADDRESS; + } + + error = Net::stringToAddress(multicastAddressValue, &multicastAddress, false); + + if (error == NoError) + { + dMemset(&PlatformNetState::multicast6Group, '\0', sizeof(&PlatformNetState::multicast6Group)); + NetAddressToIPSocket6(&multicastAddress, &multicastSocketAddress); + dMemcpy(&PlatformNetState::multicast6Group.ipv6mr_multiaddr, &multicastSocketAddress.sin6_addr, sizeof(PlatformNetState::multicast6Group.ipv6mr_multiaddr)); + } + + // Setup group + + if (error == NoError) + { + const char *multicastInterface = Con::getVariable("pref::Net::Multicast6Interface"); + + if (multicastInterface && multicastInterface[0] != '\0') + { +#ifdef TORQUE_USE_WINSOCK + PlatformNetState::multicast6Group.ipv6mr_interface = dAtoi(multicastInterface); +#else + PlatformNetState::multicast6Group.ipv6mr_interface = if_nametoindex(multicastInterface); +#endif + } + else + { + PlatformNetState::multicast6Group.ipv6mr_interface = 0; // 0 == accept from any interface + } + + if (PlatformNetState::multicast6Group.ipv6mr_interface && error == NoError) + { + if (setsockopt(socketFd, IPPROTO_IPV6, IPV6_MULTICAST_IF, (char *)&PlatformNetState::multicast6Group.ipv6mr_interface, sizeof(PlatformNetState::multicast6Group.ipv6mr_interface)) < 0) + { + error = PlatformNetState::getLastError(); + } + } + + if (error == NoError && setsockopt(socketFd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char*)&PlatformNetState::multicast6Group, sizeof(PlatformNetState::multicast6Group)) < 0) + { + error = PlatformNetState::getLastError(); + } + } + + + if (error == NoError) + { + NetAddress listenAddress; + char listenAddressStr[256]; + Net::addressToString(&multicastAddress, listenAddressStr); + Con::printf("Multicast initialized on %s", listenAddressStr); + } + + if (error != NoError) + { + PlatformNetState::multicast6Socket = NetSocket::INVALID; + Con::printf("Unable to multicast UDP - error %d", error); + } + } + } +} + +void Net::disableMulticast() +{ + if (PlatformNetState::multicast6Socket != NetSocket::INVALID) + { + PlatformNetState::multicast6Socket = NetSocket::INVALID; + } +} + +bool Net::isMulticastEnabled() +{ + return PlatformNetState::multicast6Socket != NetSocket::INVALID; +} + +U32 NetAddress::getHash() const +{ + U32 value = 0; + switch (type) + { + case NetAddress::IPAddress: + value = hash((U8*)&address.ipv4.netNum, sizeof(address.ipv4.netNum), 0); + break; + case NetAddress::IPV6Address: + value = hash((U8*)address.ipv6.netNum, sizeof(address.ipv6.netNum), 0); + break; + default: + value = 0; + break; + } + return value; +} + +bool Net::isAddressTypeAvailable(NetAddress::Type addressType) +{ + switch (addressType) + { + case NetAddress::IPAddress: + return PlatformNetState::udpSocket != NetSocket::INVALID; + case NetAddress::IPV6Address: + return PlatformNetState::udp6Socket != NetSocket::INVALID; + case NetAddress::IPBroadcastAddress: + return PlatformNetState::udpSocket != NetSocket::INVALID; + case NetAddress::IPV6MulticastAddress: + return PlatformNetState::multicast6Socket != NetSocket::INVALID; + default: + return false; + } +} diff --git a/engine/source/platform/platformNet.h b/engine/source/platform/platformNet.h new file mode 100644 index 000000000..1abd3a053 --- /dev/null +++ b/engine/source/platform/platformNet.h @@ -0,0 +1,263 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _PLATFORM_PLATFORMNET_H_ +#define _PLATFORM_PLATFORMNET_H_ + +#ifndef _TORQUE_TYPES_H_ +#include "platform/types.h" +#endif + +#include "platform/platformMemory.h" + +#ifndef MAXPACKETSIZE +#define MAXPACKETSIZE 1500 +#endif + +#ifndef TORQUE_NET_DEFAULT_MULTICAST_ADDRESS +#define TORQUE_NET_DEFAULT_MULTICAST_ADDRESS "ff04::7467::656E::6574::776B" +#endif + +typedef S32 NetConnectionId; + +/// Generic network address +/// +/// This is used to represent IP addresses. +struct NetAddress +{ + S32 type; ///< Type of address (IPAddress currently) + + /// Acceptable NetAddress types. + enum Type + { + IPAddress, + IPV6Address, + + IPBroadcastAddress, + IPV6MulticastAddress + }; + + union + { + struct { + U8 netNum[4]; + } ipv4; + + struct { + U8 netNum[16]; + U32 netFlow; + U32 netScope; + } ipv6; + + struct { + U8 netNum[16]; + U8 netFlow[4]; + U8 netScope[4]; + } ipv6_raw; + + } address; + + U16 port; + + bool isSameAddress(const NetAddress &other) const + { + if (type != other.type) + return false; + + switch (type) + { + case NetAddress::IPAddress: + return (dMemcmp(other.address.ipv4.netNum, address.ipv4.netNum, 4) == 0); + break; + case NetAddress::IPV6Address: + return (dMemcmp(other.address.ipv6.netNum, address.ipv6.netNum, 16) == 0); + break; + case NetAddress::IPBroadcastAddress: + return true; + break; + case NetAddress::IPV6MulticastAddress: + return true; + break; + } + + return false; + } + + bool isSameAddressAndPort(const NetAddress &other) const + { + if (type != other.type) + return false; + + switch (type) + { + case NetAddress::IPAddress: + return (dMemcmp(other.address.ipv4.netNum, address.ipv4.netNum, 4) == 0) && other.port == port; + break; + case NetAddress::IPV6Address: + return (dMemcmp(other.address.ipv6.netNum, address.ipv6.netNum, 16) == 0) && other.port == port; + break; + case NetAddress::IPBroadcastAddress: + return true; + break; + case NetAddress::IPV6MulticastAddress: + return true; + break; + } + + return false; + } + + bool isEqual(const NetAddress &other) const + { + if (type != other.type) + return false; + + switch (type) + { + case NetAddress::IPAddress: + return other.port == port && (dMemcmp(other.address.ipv4.netNum, address.ipv4.netNum, 4) == 0); + break; + case NetAddress::IPV6Address: + return other.port == port && other.address.ipv6.netFlow == address.ipv6.netFlow && other.address.ipv6.netScope == address.ipv6.netScope && (dMemcmp(other.address.ipv6.netNum, address.ipv6.netNum, 16) == 0); + break; + case NetAddress::IPBroadcastAddress: + return other.port == port; + break; + case NetAddress::IPV6MulticastAddress: + return other.port == port; + break; + } + + return false; + } + + U32 getHash() const; +}; + +class NetSocket +{ +protected: + S32 mHandle; + +public: + NetSocket() : mHandle(-1) { ; } + + inline void setHandle(S32 handleId) { mHandle = handleId; } + inline S32 getHandle() const { return mHandle; } + inline U32 getHash() const { return mHandle; } + + bool operator==(const NetSocket &other) const { return mHandle == other.mHandle; } + bool operator!=(const NetSocket &other) const { return mHandle != other.mHandle; } + + static NetSocket fromHandle(S32 handleId) { NetSocket ret; ret.mHandle = handleId; return ret; } + static NetSocket INVALID; +}; + + +/// Platform-specific network operations. +struct Net +{ + enum Error + { + NoError, + WrongProtocolType, + InvalidPacketProtocol, + WouldBlock, + NotASocket, + UnknownError, + NeedHostLookup + }; + + enum ConnectionState { + DNSResolved, + DNSFailed, + Connected, + ConnectFailed, + Disconnected + }; + + static const S32 MaxPacketDataSize = MAXPACKETSIZE; + + static bool smMulticastEnabled; + static bool smIpv4Enabled; + static bool smIpv6Enabled; + + static bool init(); + static void shutdown(); + + // Unreliable net functions (UDP) + // sendto is for sending data + // all incoming data comes in on packetReceiveEventType + // App can only open one unreliable port... who needs more? ;) + + static bool openPort(S32 connectPort, bool doBind = true); + static NetSocket getPort(); + + static void closePort(); + static Error sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize); + + // Reliable net functions (TCP) + // all incoming messages come in on the Connected* events + static NetSocket openListenPort(U16 port, NetAddress::Type = NetAddress::IPAddress); + static NetSocket openConnectTo(const char *stringAddress); // does the DNS resolve etc. + static void closeConnectTo(NetSocket socket); + static Error sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize, S32 *bytesWritten=NULL); + + static bool compareAddresses(const NetAddress *a1, const NetAddress *a2); + static Net::Error stringToAddress(const char *addressString, NetAddress *address, bool hostLookup=true, int family=0); + static void addressToString(const NetAddress *address, char addressString[256]); + + // lower level socked based network functions + static NetSocket openSocket(); + static Error closeSocket(NetSocket socket); + + static Error send(NetSocket socket, const U8 *buffer, S32 bufferSize, S32 *outBytesWritten=NULL); + static Error recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead); + + static Error connect(NetSocket socket, const NetAddress *address); + static Error listen(NetSocket socket, S32 maxConcurrentListens); + static NetSocket accept(NetSocket acceptSocket, NetAddress *remoteAddress); + + static Error bindAddress(const NetAddress &address, NetSocket socket, bool useUDP=false); + static Error setBufferSize(NetSocket socket, S32 bufferSize); + static Error setBroadcast(NetSocket socket, bool broadcastEnable); + static Error setBlocking(NetSocket socket, bool blockingIO); + + /// Gets the desired default listen address for a specified address type + static Net::Error getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults=false); + static void getIdealListenAddress(NetAddress *address); + + // Multicast for ipv6 local net browsing + static void enableMulticast(); + static void disableMulticast(); + static bool isMulticastEnabled(); + + // Protocol state + static bool isAddressTypeAvailable(NetAddress::Type addressType); + + static void process(); +private: + static void processListenSocket(NetSocket socket); + +}; + +#endif diff --git a/engine/source/platform/platformNetAsync.unix.cc b/engine/source/platform/platformNetAsync.cpp old mode 100755 new mode 100644 similarity index 90% rename from engine/source/platform/platformNetAsync.unix.cc rename to engine/source/platform/platformNetAsync.cpp index 6036d7f4b..6b6886261 --- a/engine/source/platform/platformNetAsync.unix.cc +++ b/engine/source/platform/platformNetAsync.cpp @@ -1,217 +1,223 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "platform/threads/mutex.h" -#include "platform/threads/thread.h" -#include "platform/platformNetAsync.unix.h" -#include "console/console.h" - -#include -#include -#include -#include - -NetAsync gNetAsync; - -#define LOOKUP_REQUEST_CHECK_INTERVAL 500 - -void* gNetAsyncMutex = NULL; - -static void lockNetAsyncMutex() -{ - if(!gNetAsyncMutex) - gNetAsyncMutex = Mutex::createMutex(); - - AssertFatal(gNetAsyncMutex, "Could not create gNetAsyncMutex!"); - - Mutex::lockMutex(gNetAsyncMutex); -} - -static void unlockNetAsyncMutex() -{ - if(!gNetAsyncMutex) - gNetAsyncMutex = Mutex::createMutex(); - - AssertFatal(gNetAsyncMutex, "Could not create gNetAsyncMutex!"); - - Mutex::unlockMutex(gNetAsyncMutex); -} - -// internal structure for storing information about a name lookup request -struct NameLookupRequest -{ - NetSocket sock; - char remoteAddr[4096]; - char out_h_addr[4096]; - int out_h_length; - bool complete; - - NameLookupRequest() - { - sock = InvalidSocket; - remoteAddr[0] = 0; - out_h_addr[0] = 0; - out_h_length = -1; - complete = false; - } -}; - -void NetAsync::queueLookup(const char* remoteAddr, NetSocket socket) -{ - lockNetAsyncMutex(); - // do we have it already? - unsigned int i = 0; - for (i = 0; i < mLookupRequests.size(); ++i) - { - if (mLookupRequests[i]->sock == socket) - // found it. ignore more than one lookup at a time for a socket. - break; - } - - if (i == mLookupRequests.size()) - { - // not found, so add it - NameLookupRequest* lookupRequest = new NameLookupRequest(); - lookupRequest->sock = socket; - dStrncpy(lookupRequest->remoteAddr, remoteAddr, - sizeof(lookupRequest->remoteAddr)); - mLookupRequests.push_back(lookupRequest); - } - unlockNetAsyncMutex(); -} - -void NetAsync::run() -{ - if (isRunning()) - return; - - mRunning = true; - NameLookupRequest* lookupRequest = NULL; - - while (isRunning()) - { - lookupRequest = NULL; - - // lock - lockNetAsyncMutex(); - // if there is a request... - if (mLookupRequests.size() > 0) - { - // assign the first incomplete request - for (unsigned int i = 0; i < mLookupRequests.size(); ++i) - if (!mLookupRequests[i]->complete) - lookupRequest = mLookupRequests[i]; - } - - // unlock so that more requests can be added - unlockNetAsyncMutex(); - - // if we have a lookup request - if (lookupRequest != NULL) - { - // do it - struct hostent* hostent = gethostbyname(lookupRequest->remoteAddr); - if (hostent == NULL) - { - // oh well! leave the lookup data unmodified (h_length) should - // still be -1 from initialization - lookupRequest->complete = true; - } - else - { - // copy the stuff we need from the hostent - dMemset(lookupRequest->out_h_addr, 0, - sizeof(lookupRequest->out_h_addr)); - dMemcpy(lookupRequest->out_h_addr, hostent->h_addr, hostent->h_length); - - lookupRequest->out_h_length = hostent->h_length; - lookupRequest->complete = true; - } - } - else - { - // no lookup request. sleep for a bit - Platform::sleep(LOOKUP_REQUEST_CHECK_INTERVAL); - } - }; -} - -bool NetAsync::checkLookup(NetSocket socket, char* out_h_addr, - int* out_h_length, int out_h_addr_size) -{ - lockNetAsyncMutex(); - bool found = false; - // search for the socket - Vector::iterator iter; - for (iter = mLookupRequests.begin(); - iter != mLookupRequests.end(); - ++iter) - // if we found it and it is complete... - if (socket == (*iter)->sock && (*iter)->complete) - { - // copy the lookup data to the callers parameters - dMemcpy(out_h_addr, (*iter)->out_h_addr, out_h_addr_size); - *out_h_length = (*iter)->out_h_length; - found = true; - break; - } - - // we found the socket, so we are done with it. erase. - if (found) - { - delete *iter; - mLookupRequests.erase(iter); - } - unlockNetAsyncMutex(); - - return found; -} - -// this is called by the pthread module to start the thread -static void StartThreadFunc(S32 nothing) -{ - if (gNetAsync.isRunning()) - return; - - gNetAsync.run(); - return; -} - - -void NetAsync::startAsync() -{ - if (gNetAsync.isRunning()) - return; - - // create the thread... - Thread *zThread = new Thread((ThreadRunFunction)StartThreadFunc, 0, true); - - if (!zThread) - Con::errorf("Error starting net async thread."); -} - -void NetAsync::stopAsync() -{ - if (gNetAsync.isRunning()) - gNetAsync.stop(); -} +//----------------------------------------------------------------------------- +// Copyright (c) 2013 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#include "platform/platform.h" +#include "platform/threads/mutex.h" +#include "platform/threads/thread.h" +#include "platform/platformNetAsync.h" +#include "console/console.h" + +#if defined(TORQUE_OS_WIN32) +# include +#else +#include +#include +#endif + +#include +#include + +NetAsync gNetAsync; + +#define LOOKUP_REQUEST_CHECK_INTERVAL 500 + +void* gNetAsyncMutex = NULL; + +static void lockNetAsyncMutex() +{ + if(!gNetAsyncMutex) + gNetAsyncMutex = Mutex::createMutex(); + + AssertFatal(gNetAsyncMutex, "Could not create gNetAsyncMutex!"); + + Mutex::lockMutex(gNetAsyncMutex); +} + +static void unlockNetAsyncMutex() +{ + if(!gNetAsyncMutex) + gNetAsyncMutex = Mutex::createMutex(); + + AssertFatal(gNetAsyncMutex, "Could not create gNetAsyncMutex!"); + + Mutex::unlockMutex(gNetAsyncMutex); +} + +// internal structure for storing information about a name lookup request +struct NameLookupRequest +{ + NetSocket sock; + char remoteAddr[4096]; + char out_h_addr[4096]; + int out_h_length; + bool complete; + + NameLookupRequest() + { + sock = NetSocket::INVALID; + remoteAddr[0] = 0; + out_h_addr[0] = 0; + out_h_length = -1; + complete = false; + } +}; + +void NetAsync::queueLookup(const char* remoteAddr, NetSocket socket) +{ + lockNetAsyncMutex(); + // do we have it already? + unsigned int i = 0; + for (i = 0; i < mLookupRequests.size(); ++i) + { + if (mLookupRequests[i]->sock == socket) + // found it. ignore more than one lookup at a time for a socket. + break; + } + + if (i == mLookupRequests.size()) + { + // not found, so add it + NameLookupRequest* lookupRequest = new NameLookupRequest(); + lookupRequest->sock = socket; + dStrncpy(lookupRequest->remoteAddr, remoteAddr, + sizeof(lookupRequest->remoteAddr)); + mLookupRequests.push_back(lookupRequest); + } + unlockNetAsyncMutex(); +} + +void NetAsync::run() +{ + if (isRunning()) + return; + + mRunning = true; + NameLookupRequest* lookupRequest = NULL; + + while (isRunning()) + { + lookupRequest = NULL; + + // lock + lockNetAsyncMutex(); + // if there is a request... + if (mLookupRequests.size() > 0) + { + // assign the first incomplete request + for (unsigned int i = 0; i < mLookupRequests.size(); ++i) + if (!mLookupRequests[i]->complete) + lookupRequest = mLookupRequests[i]; + } + + // unlock so that more requests can be added + unlockNetAsyncMutex(); + + // if we have a lookup request + if (lookupRequest != NULL) + { + NetAddress address; + Net::Error error = Net::stringToAddress(lookupRequest->remoteAddr, &address, true); + // do it + if (error != Net::NoError) + { + // oh well! leave the lookup data unmodified (h_length) should + // still be -1 from initialization + lookupRequest->complete = true; + } + else + { + // copy the stuff we need from the hostent + dMemset(lookupRequest->out_h_addr, 0, + sizeof(lookupRequest->out_h_addr)); + dMemcpy(lookupRequest->out_h_addr, &address, sizeof(address)); + + lookupRequest->out_h_length = sizeof(address); + lookupRequest->complete = true; + } + } + else + { + // no lookup request. sleep for a bit + Platform::sleep(LOOKUP_REQUEST_CHECK_INTERVAL); + } + }; +} + +bool NetAsync::checkLookup(NetSocket socket, void* out_h_addr, + int* out_h_length, int out_h_addr_size) +{ + lockNetAsyncMutex(); + bool found = false; + // search for the socket + Vector::iterator iter; + for (iter = mLookupRequests.begin(); + iter != mLookupRequests.end(); + ++iter) + // if we found it and it is complete... + if (socket == (*iter)->sock && (*iter)->complete) + { + // copy the lookup data to the callers parameters + dMemcpy(out_h_addr, (*iter)->out_h_addr, out_h_addr_size); + *out_h_length = (*iter)->out_h_length; + found = true; + break; + } + + // we found the socket, so we are done with it. erase. + if (found) + { + delete *iter; + mLookupRequests.erase(iter); + } + unlockNetAsyncMutex(); + + return found; +} + +// this is called by the pthread module to start the thread +static void StartThreadFunc(S32 nothing) +{ + if (gNetAsync.isRunning()) + return; + + gNetAsync.run(); + return; +} + + +void NetAsync::startAsync() +{ + if (gNetAsync.isRunning()) + return; + + // create the thread... + Thread *zThread = new Thread((ThreadRunFunction)StartThreadFunc, 0, true); + + if (!zThread) + Con::errorf("Error starting net async thread."); +} + +void NetAsync::stopAsync() +{ + if (gNetAsync.isRunning()) + gNetAsync.stop(); +} diff --git a/engine/source/platform/platformNetAsync.unix.h b/engine/source/platform/platformNetAsync.h old mode 100755 new mode 100644 similarity index 95% rename from engine/source/platform/platformNetAsync.unix.h rename to engine/source/platform/platformNetAsync.h index 1728f52ee..196e1a2bc --- a/engine/source/platform/platformNetAsync.unix.h +++ b/engine/source/platform/platformNetAsync.h @@ -1,73 +1,74 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef PLATFORM_NET_ASYNC_H -#define PLATFORM_NET_ASYNC_H - -#include "platform/platform.h" -#include "collection/vector.h" - -struct NameLookupRequest; - -// class for doing asynchronous network operations on unix (linux and -// hopefully osx) platforms. right now it only implements dns lookups -class NetAsync -{ - private: - Vector mLookupRequests; - bool mRunning; - - public: - NetAsync() - { - mRunning = false; - } - - // queue a DNS lookup. only one dns lookup can be queued per socket at - // a time. subsequent queue request for the socket are ignored. use - // checkLookup() to check the status of a request. - void queueLookup(const char* remoteAddr, NetSocket socket); - - // check on the status of a dns lookup for a socket. if the lookup is - // not yet complete, the function will return false. if it is - // complete, the function will return true, and out_h_addr and - // out_h_length will be set appropriately. if out_h_length is -1, then - // name could not be resolved. otherwise, it provides the number of - // address bytes copied into out_h_addr. - bool checkLookup(NetSocket socket, char* out_h_addr, int* out_h_length, int out_h_addr_size); - - // returns true if the async thread is running, false otherwise - bool isRunning() { return mRunning; }; - - // these functions are used by the static start/stop functions - void run(); - void stop() { mRunning = false; }; - - // used to start and stop the thread - static void startAsync(); - static void stopAsync(); -}; - -// the global net async object -extern NetAsync gNetAsync; - -#endif +//----------------------------------------------------------------------------- +// Copyright (c) 2013 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef PLATFORM_NET_ASYNC_H +#define PLATFORM_NET_ASYNC_H + +#include "platform/platform.h" +#include "platform/platformNet.h" +#include "collection/vector.h" + +struct NameLookupRequest; + +// class for doing asynchronous network operations on unix (linux and +// hopefully osx) platforms. right now it only implements dns lookups +class NetAsync +{ + private: + Vector mLookupRequests; + bool mRunning; + + public: + NetAsync() + { + mRunning = false; + } + + // queue a DNS lookup. only one dns lookup can be queued per socket at + // a time. subsequent queue request for the socket are ignored. use + // checkLookup() to check the status of a request. + void queueLookup(const char* remoteAddr, NetSocket socket); + + // check on the status of a dns lookup for a socket. if the lookup is + // not yet complete, the function will return false. if it is + // complete, the function will return true, and out_h_addr and + // out_h_length will be set appropriately. if out_h_length is -1, then + // name could not be resolved. otherwise, it provides the number of + // address bytes copied into out_h_addr. + bool checkLookup(NetSocket socket, void* out_h_addr, int* out_h_length, int out_h_addr_size); + + // returns true if the async thread is running, false otherwise + bool isRunning() { return mRunning; }; + + // these functions are used by the static start/stop functions + void run(); + void stop() { mRunning = false; }; + + // used to start and stop the thread + static void startAsync(); + static void stopAsync(); +}; + +// the global net async object +extern NetAsync gNetAsync; + +#endif diff --git a/engine/source/platform/platformNet_Emscripten.cpp b/engine/source/platform/platformNet_Emscripten.cpp new file mode 100644 index 000000000..1895b31b2 --- /dev/null +++ b/engine/source/platform/platformNet_Emscripten.cpp @@ -0,0 +1,217 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#include "platform/platformNet.h" +#include "platform/event.h" +#include "console/console.h" +#include "game/gameInterface.h" + +NetSocket NetSocket::INVALID = NetSocket::fromHandle(-1); + +static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address); +static void IPSocket6ToNetAddress(const struct sockaddr_in6 *sockAddr, NetAddress *address); + +bool Net::init() +{ + return(true); +} + +void Net::shutdown() +{ + + +} + +// ipv4 version of name routines + +static void NetAddressToIPSocket(const NetAddress *address, struct sockaddr_in *sockAddr) +{ + +} + +static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) +{ + +} + +// ipv6 version of name routines + +static void NetAddressToIPSocket6(const NetAddress *address, struct sockaddr_in6 *sockAddr) +{ + +} + +static void IPSocket6ToNetAddress(const struct sockaddr_in6 *sockAddr, NetAddress *address) +{ +} + +// + +NetSocket Net::openListenPort(U16 port, NetAddress::Type addressType) +{ + return NetSocket::INVALID; +} + +NetSocket Net::openConnectTo(const char *addressString) +{ + return NetSocket::INVALID; +} + +void Net::closeConnectTo(NetSocket handleFd) +{ + +} + +Net::Error Net::sendtoSocket(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBufferWritten) +{ + return NoError; +} + +bool Net::openPort(S32 port, bool doBind) +{ + return false; +} + +NetSocket Net::getPort() +{ + return NetSocket::INVALID; +} + +void Net::closePort() +{ + +} + +Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) +{ + return NoError; +} + +void Net::process() +{ + +} + +void Net::processListenSocket(NetSocket socketHandle) +{ +} + +NetSocket Net::openSocket() +{ + return NetSocket::INVALID; +} + +Net::Error Net::closeSocket(NetSocket handleFd) +{ + return NoError; +} + +Net::Error Net::connect(NetSocket handleFd, const NetAddress *address) +{ + return NoError; +} + +Net::Error Net::listen(NetSocket handleFd, S32 backlog) +{ + return NoError; +} + +NetSocket Net::accept(NetSocket handleFd, NetAddress *remoteAddress) +{ + return NetSocket::INVALID; +} + +Net::Error Net::bindAddress(const NetAddress &address, NetSocket handleFd, bool useUDP) +{ + return NoError; +} + +Net::Error Net::setBufferSize(NetSocket handleFd, S32 bufferSize) +{ + return NoError; +} + +Net::Error Net::setBroadcast(NetSocket handleFd, bool broadcast) +{ + return NoError; +} + +Net::Error Net::setBlocking(NetSocket handleFd, bool blockingIO) +{ + return NoError; +} + +Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *address, bool forceDefaults) +{ + return NoError; +} + +void Net::getIdealListenAddress(NetAddress *address) +{ +} + +Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *outBytesWritten) +{ + return NoError; +} + +Net::Error Net::recv(NetSocket handleFd, U8 *buffer, S32 bufferSize, S32 *bytesRead) +{ + return NoError; +} + +bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) +{ + return false; +} + +Net::Error Net::stringToAddress(const char *addressString, NetAddress *address, bool hostLookup, int requiredFamily) +{ + return NoError; +} + +void Net::addressToString(const NetAddress *address, char addressString[256]) +{ +} + +void Net::enableMulticast() +{ +} + +void Net::disableMulticast() +{ +} + +bool Net::isMulticastEnabled() +{ + return false; +} + +U32 NetAddress::getHash() const +{ + return 0; +} + +bool Net::isAddressTypeAvailable(NetAddress::Type addressType) +{ + return false; +} diff --git a/engine/source/platform/platformNetwork_ScriptBinding.cc b/engine/source/platform/platformNet_ScriptBinding.cc similarity index 77% rename from engine/source/platform/platformNetwork_ScriptBinding.cc rename to engine/source/platform/platformNet_ScriptBinding.cc index 7c84bca45..ad8f3fa31 100644 --- a/engine/source/platform/platformNetwork_ScriptBinding.cc +++ b/engine/source/platform/platformNet_ScriptBinding.cc @@ -1,58 +1,70 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _CONSOLE_H_ -#include "console/console.h" -#endif - -#ifndef _PLATFORM_NETWORK_H_ -#include "platformNetwork.h" -#endif - -/*! @addtogroup Network Network - @ingroup TorqueScriptFunctions - @{ -*/ - -/*! - Set the network port for the game to use. - @param The requested port as an integer - @return Returns true on success, false on fail -*/ -ConsoleFunctionWithDocs( setNetPort, ConsoleBool, 2, 2, (int port)) -{ - return Net::openPort(dAtoi(argv[1])); -} - -//----------------------------------------------------------------------------- - -/*! - @brief Closes the current network port - @ingroup Networking -*/ -ConsoleFunctionWithDocs( closeNetPort, ConsoleVoid, 1, 1, ()) -{ - Net::closePort(); -} - - -/*! @} */ // end group Network +//----------------------------------------------------------------------------- +// Copyright (c) 2013 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _CONSOLE_H_ +#include "console/console.h" +#endif + +#ifndef _PLATFORM_PLATFORMNET_H_ +#include "platformNet.h" +#endif + +/*! @addtogroup Network Network + @ingroup TorqueScriptFunctions + @{ +*/ + +/*! +Determines if a specified address type can be reached. +@param protocol id +@return Returns true on success, false on fail +*/ +ConsoleFunctionWithDocs(isAddressTypeAvailable, ConsoleBool, 2, 2, (int addressType)) +{ + return Net::isAddressTypeAvailable((NetAddress::Type)dAtoi(argv[1])); +} +/*! + Set the network port for the game to use. + @param The requested port as an integer + @return Returns true on success, false on fail +*/ +ConsoleFunctionWithDocs( setNetPort, ConsoleBool, 2, 3, (int port, bind)) +{ + bool bind = true; + if (argc > 2) + bind = dAtob(argv[2]); + return Net::openPort(dAtoi(argv[1]), bind); +} + +//----------------------------------------------------------------------------- + +/*! + @brief Closes the current network port + @ingroup Networking +*/ +ConsoleFunctionWithDocs( closeNetPort, ConsoleVoid, 1, 1, ()) +{ + Net::closePort(); +} + + +/*! @} */ // end group Network diff --git a/engine/source/platform/platformNetwork.h b/engine/source/platform/platformNetwork.h deleted file mode 100755 index bc3052b79..000000000 --- a/engine/source/platform/platformNetwork.h +++ /dev/null @@ -1,91 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PLATFORM_NETWORK_H_ -#define _PLATFORM_NETWORK_H_ - -#ifndef _TORQUE_TYPES_H_ -#include "platform/types.h" -#endif - -//----------------------------------------------------------------------------- - -struct NetAddress; - -typedef S32 NetSocket; -const NetSocket InvalidSocket = -1; - -//----------------------------------------------------------------------------- - -struct Net -{ - enum Error - { - NoError, - WrongProtocolType, - InvalidPacketProtocol, - WouldBlock, - NotASocket, - UnknownError - }; - - enum Protocol - { - UDPProtocol, - IPXProtocol, - TCPProtocol - }; - - static bool init(); - static void shutdown(); - static void process(); - - // Unreliable network functions (UDP) - static bool openPort(S32 connectPort); - static void closePort(); - static Error sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize); - - // Reliable network functions (TCP) - static NetSocket openListenPort(U16 port); - static NetSocket openConnectTo(const char *stringAddress); // does the DNS resolve etc. - static void closeConnectTo(NetSocket socket); - static Error sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize); - - static bool compareAddresses(const NetAddress *a1, const NetAddress *a2); - static bool stringToAddress(const char *addressString, NetAddress *address); - static void addressToString(const NetAddress *address, char addressString[256]); - - // Lower-level socket-based functions. - static NetSocket openSocket(); - static Error closeSocket(NetSocket socket); - static Error connect(NetSocket socket, const NetAddress *address); - static Error listen(NetSocket socket, S32 maxConcurrentListens); - static NetSocket accept(NetSocket acceptSocket, NetAddress *remoteAddress); - static Error bind(NetSocket socket, U16 port); - static Error setBufferSize(NetSocket socket, S32 bufferSize); - static Error setBroadcast(NetSocket socket, bool broadcastEnable); - static Error setBlocking(NetSocket socket, bool blockingIO); - static Error send(NetSocket socket, const U8 *buffer, S32 bufferSize); - static Error recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead); -}; - -#endif // _PLATFORM_NETWORK_H_ diff --git a/engine/source/platform/platformString.h b/engine/source/platform/platformString.h index 7ac5050bf..1fe6265b8 100755 --- a/engine/source/platform/platformString.h +++ b/engine/source/platform/platformString.h @@ -63,8 +63,8 @@ extern char* dStrrchr(char *str, int c); extern const char* dStrrchr(const char *str, int c); extern U32 dStrspn(const char *str, const char *set); extern U32 dStrcspn(const char *str, const char *set); -extern char* dStrstr(char *str1, char *str2); -extern char* dStrstr(const char *str1, const char *str2); +extern char* dStrstr(char *str1, const char *str2); +extern const char* dStrstr(const char *str1, const char *str2); extern char* dStrtok(char *str, const char *sep); diff --git a/engine/source/input/leapMotion/leapMotionConstants.h b/engine/source/platform/tmm_off.h similarity index 84% rename from engine/source/input/leapMotion/leapMotionConstants.h rename to engine/source/platform/tmm_off.h index f45d39c9d..928de6955 100644 --- a/engine/source/input/leapMotion/leapMotionConstants.h +++ b/engine/source/platform/tmm_off.h @@ -20,16 +20,4 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _LEAPMOTIONCONSTANTS_H_ -#define _LEAPMOTIONCONSTANTS_H_ - -namespace LeapMotionConstants -{ - enum Constants - { - MaxHands = 2, - MaxPointablesPerHand = 5, - }; -} - -#endif // _LEAPMOTIONCONSTANTS_H_ +#undef new diff --git a/engine/compilers/VisualStudio 2015/main.cs b/engine/source/platform/tmm_on.h similarity index 84% rename from engine/compilers/VisualStudio 2015/main.cs rename to engine/source/platform/tmm_on.h index 0a3943c80..a7e8cc28b 100644 --- a/engine/compilers/VisualStudio 2015/main.cs +++ b/engine/source/platform/tmm_on.h @@ -1,5 +1,5 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC +// Copyright (c) 2012 GarageGames, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to @@ -20,6 +20,6 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -// This file simply points to the real main.cs file in the root of the working directory. -// This is needed if the project is run in debug mode from within VisualStudio. -exec("../../../main.cs"); +#ifndef TORQUE_DISABLE_MEMORY_MANAGER +# define new _new +#endif diff --git a/engine/source/platform/types.ppc.h b/engine/source/platform/types.ppc.h index 508e98236..cd9823c45 100755 --- a/engine/source/platform/types.ppc.h +++ b/engine/source/platform/types.ppc.h @@ -46,5 +46,6 @@ typedef U64 FileTime; # define NULL (0) #endif +#define _WCHAR_H_CPLUSPLUS_98_CONFORMANCE_ #endif //_TYPESPPC_H_ diff --git a/engine/source/platform/typetraits.h b/engine/source/platform/typetraits.h new file mode 100644 index 000000000..658fdaa83 --- /dev/null +++ b/engine/source/platform/typetraits.h @@ -0,0 +1,425 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +#ifndef _TYPETRAITS_H_ +#define _TYPETRAITS_H_ + +#ifndef _PLATFORM_H_ +# include "platform/platform.h" +#endif + + +/// @file +/// Template definitions for introspecting type properties. + + +//-------------------------------------------------------------------------- +// Type Predicating. +//-------------------------------------------------------------------------- + +struct TrueType {}; +struct FalseType {}; + +template< typename T > +inline bool IsTrueType() +{ + return false; +} +template<> +inline bool IsTrueType< TrueType >() +{ + return true; +} + +template< typename T > +inline bool IsFalseType() +{ + return false; +} +template<> +inline bool IsFalseType< FalseType >() +{ + return true; +} + + +template< typename T, typename IfTrue, typename IfFalse > +struct IfTrueType : public IfFalse {}; +template< typename IfTrue, typename IfFalse > +struct IfTrueType< TrueType, IfTrue, IfFalse > : public IfTrue {}; + +template< typename T, typename IfTrue, typename IfFalse > +struct IfFalseType : public IfTrue {}; +template< typename IfTrue, typename IfFalse > +struct IfFalseType< FalseType, IfTrue, IfFalse > : public IfFalse {}; + +//-------------------------------------------------------------------------- +// Construct. +//-------------------------------------------------------------------------- + +struct _ConstructDefault +{ + template< typename T > + static T single() + { + return T(); + } + template< typename T, typename A > + static T single( A a ) + { + return T( a ); + } + template< typename T, typename A, typename B > + static T single( A a, B b ) + { + return T( a, b ); + } + template< typename T > + static void array( T* ptr, U32 num ) + { + constructArrayInPlace< T >( ptr, num ); + } + template< typename T, typename A > + static void array( T* ptr, U32 num, A a ) + { + for( U32 i = 0; i < num; ++ i ) + ptr[ i ] = single< T >( a ); + } +}; +struct _ConstructPrim +{ + template< typename T > + static T single() + { + return 0; + } + template< typename T, typename A > + static T single( T a ) + { + return a; + } + template< typename T > + static void array( T* ptr, U32 num ) + { + dMemset( ptr, 0, num * sizeof( T ) ); + } + template< typename T, typename A > + static void array( T* ptr, U32 num, T a ) + { + for( U32 i = 0; i < num; ++ i ) + ptr[ i ] = a; + } +}; +struct _ConstructPtr +{ + template< typename T > + static T* single() + { + return new T; + } + template< typename T, typename A > + static T* single( A a ) + { + return new T( a ); + } + template< typename T, typename A, typename B > + static T* single( A a, B b ) + { + return new T( a, b ); + } + template< typename T > + static void array( T** ptr, U32 num ) + { + for( U32 i = 0; i < num; ++ i ) + ptr[ i ] = single< T >(); + } + template< typename T, typename A > + static void array( T** ptr, U32 num, A a ) + { + for( U32 i = 0; i < num; ++ i ) + ptr[ i ] = single< T >( a ); + } +}; + +//-------------------------------------------------------------------------- +// Destruct. +//-------------------------------------------------------------------------- + +struct _DestructDefault +{ + template< typename T > + static void single( T& val ) + { + val.~T(); + } + template< typename T > + static void array( T* ptr, U32 num ) + { + for( U32 i = 0; i < num; ++ i ) + single< T >( ptr[ i ] ); + } +}; +struct _DestructPrim +{ + template< typename T > + static void single( T& val ) {} + template< typename T > + static void array( T* ptr, U32 num ) {} +}; +struct _DestructPtr +{ + template< typename T > + static void single( T*& val ) + { + delete val; + val = NULL; + } + template< typename T > + static void array( T* ptr, U32 num ) + { + for( U32 i = 0; i < num; ++ i ) + single< T >( ptr[ i ] ); + } +}; + +//-------------------------------------------------------------------------- +// TypeTraits. +//-------------------------------------------------------------------------- + +template< typename T > +struct _TypeTraits +{ + typedef T BaseType; + typedef const T ConstType; + typedef _ConstructDefault Construct; + typedef _DestructDefault Destruct; +}; +template< typename T > +struct _TypeTraits< T* > +{ + typedef T BaseType; + typedef const T ConstType; + typedef _ConstructPtr Construct; + typedef _DestructPtr Destruct; + + template< typename A > + static bool isTaggedPtr( A* ptr ) { return ( uintptr_t( ptr ) & 0x1 ); } + template< typename A > + static A* getTaggedPtr( A* ptr ) { return ( A* ) ( uintptr_t( ptr ) | 0x1 ); } + template< typename A > + static A* getUntaggedPtr( A* ptr ) { return ( A* ) ( uintptr_t( ptr ) & (~0x1) ); } +}; + +template< typename T > +struct TypeTraits : public TypeTraits< typename T::Parent > +{ + typedef T BaseType; + typedef const T ConstType; +}; +template< typename T > +struct TypeTraits< T* > : public TypeTraits< typename T::Parent* > +{ + typedef T BaseType; + typedef const T ConstType; +}; +template< typename T > +struct TypeTraits< T* const > : public TypeTraits< typename T::Parent* > +{ + typedef T BaseType; + typedef const T ConstType; +}; +template<> +struct TypeTraits< void > : public _TypeTraits< void > {}; +template<> +struct TypeTraits< void* > : public _TypeTraits< void* > {}; +template<> +struct TypeTraits< void* const > : public _TypeTraits< void* > {}; + +// Type traits for primitive types. + +template<> +struct TypeTraits< bool > : public _TypeTraits< bool > +{ + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< S8 > : public _TypeTraits< S8 > +{ + static const S8 MIN = S8_MIN; + static const S8 MAX = S8_MAX; + static const S8 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< U8 > : public _TypeTraits< U8 > +{ + static const U8 MIN = 0; + static const U8 MAX = U8_MAX; + static const U8 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< S16 > : public _TypeTraits< S16 > +{ + static const S16 MIN = S16_MIN; + static const S16 MAX = S16_MAX; + static const S16 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< U16 > : public _TypeTraits< U16 > +{ + static const U16 MIN = 0; + static const U16 MAX = U16_MAX; + static const U16 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< S32 > : public _TypeTraits< S32 > +{ + static const S32 MIN = S32_MIN; + static const S32 MAX = S32_MAX; + static const S32 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< U32 > : public _TypeTraits< U32 > +{ + static const U32 MIN = 0; + static const U32 MAX = U32_MAX; + static const U32 ZERO = 0; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; +template<> +struct TypeTraits< F32 > : public _TypeTraits< F32 > +{ + static const F32 MIN; + static const F32 MAX; + static const F32 ZERO; + typedef _ConstructPrim Construct; + typedef _DestructPrim Destruct; +}; + +//-------------------------------------------------------------------------- +// Utilities. +//-------------------------------------------------------------------------- + +template< typename T > +inline T constructSingle() +{ + typedef typename TypeTraits< T >::BaseType Type; + typedef typename TypeTraits< T >::Construct Construct; + return Construct::template single< Type >(); +} +template< typename T, typename A > +inline T constructSingle( A a ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Construct Construct; + return Construct::template single< BaseType >( a ); +} +template< typename T, typename A, typename B > +inline T constructSingle( A a, B b ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Construct Construct; + return Construct::template single< BaseType >( a, b ); +} +template< typename T > +inline void constructArray( T* ptr, U32 num ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Construct Construct; + Construct::template array< BaseType >( ptr, num ); +} +template< typename T, typename A > +inline void constructArray( T* ptr, U32 num, A a ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Construct Construct; + Construct::template array< BaseType >( ptr, num, a ); +} +template< typename T > +inline void destructSingle( T& val ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Destruct Destruct; + Destruct::template single< BaseType >( val ); +} +template< typename T > +inline void destructArray( T* ptr, U32 num ) +{ + typedef typename TypeTraits< T >::BaseType BaseType; + typedef typename TypeTraits< T >::Destruct Destruct; + Destruct::template array< BaseType >( ptr, num ); +} + +template< typename T> +inline T& Deref( T& val ) +{ + return val; +} +template< typename T > +inline T& Deref( T* ptr ) +{ + return *ptr; +} + +/// Delete a single object policy. +struct DeleteSingle +{ + template + static void destroy(T *ptr) { delete ptr; } +}; + +/// Delete an array of objects policy. +struct DeleteArray +{ + template + static void destroy(T *ptr) { delete [] ptr; } +}; + +/// +template< typename T > +struct ValueHolder +{ + T value; + + ValueHolder( const T& value ) + : value( value ) {} + + operator T() const { return value; } +}; +template<> +struct ValueHolder< void > +{ + ValueHolder() {} +}; + +#endif // _TYPETRAITS_H_ diff --git a/engine/source/platformAndroid/AndroidFileio.cpp b/engine/source/platformAndroid/AndroidFileio.cpp index 3a668450f..3f8743a10 100755 --- a/engine/source/platformAndroid/AndroidFileio.cpp +++ b/engine/source/platformAndroid/AndroidFileio.cpp @@ -46,6 +46,36 @@ //Cache handling functions //----------------------------------------------------------------------------- bool isCachePath(const char* path) +{ + if (!path || !*path) + return false; + + if (path[0] == '/') + { + if (strstr(path, Platform::osGetTemporaryDirectory()) != NULL) + { + return true; + } + else + { + return false; + } + } + else + { + const char* tmp = Platform::osGetTemporaryDirectory(); + if (strstr(path, tmp+1) != NULL) + { + return true; + } + else + { + return false; + } + } +} + +bool isUserDataPath(const char* path) { if (!path || !*path) return false; @@ -142,7 +172,7 @@ File::~File() File::Status File::open(const char *filename, const AccessMode openMode) { //If its a cache path then we need to open it using C methods not AssetManager - if (isCachePath(filename)) + if (isCachePath(filename) || isUserDataPath(filename)) { if (dStrlen(filename) > MAX_MAC_PATH_LONG) Con::warnf("File::open: Filename length is pretty long..."); @@ -155,7 +185,14 @@ File::Status File::open(const char *filename, const AccessMode openMode) switch (openMode) { case Read: - handle = (void *)fopen(filename, "rb"); // read only + capability = FileRead; + filePointer = 0; + buffer = (U8*)_AndroidLoadInternalFile(filename, &size); + if (buffer == NULL) + currentStatus = UnknownError; + else + currentStatus = Ok; + return currentStatus; break; case Write: handle = (void *)fopen(filename, "wb"); // write only @@ -794,7 +831,7 @@ bool Platform::isFile(const char *path) if (!path || !*path) return false; - if (isCachePath(path)) + if (isCachePath(path) || isUserDataPath(path)) { // make sure we can stat the file struct stat statData; @@ -824,7 +861,7 @@ bool Platform::isDirectory(const char *path) if (!path || !*path) return false; - if (isCachePath(path)) + if (isCachePath(path) || isUserDataPath(path)) { // make sure we can stat the file struct stat statData; @@ -847,7 +884,7 @@ S32 Platform::getFileSize(const char* pFilePath) if (!pFilePath || !*pFilePath) return 0; - if (isCachePath(pFilePath)) + if (isCachePath(pFilePath) || isUserDataPath(pFilePath)) { struct stat statData; if( stat(pFilePath, &statData) < 0 ) @@ -899,7 +936,7 @@ inline bool isGoodDirectoryCache(dirent* entry) //----------------------------------------------------------------------------- bool Platform::hasSubDirectory(const char *path) { - if (isCachePath(path)) + if (isCachePath(path) || isUserDataPath(path)) { DIR *dir; dirent *entry; @@ -1091,7 +1128,7 @@ bool recurseDumpDirectoriesCache(const char *basePath, const char *path, Vector< //----------------------------------------------------------------------------- bool Platform::dumpDirectories(const char *path, Vector &directoryVector, S32 depth, bool noBasePath) { - if (isCachePath(path)) + if (isCachePath(path) || isUserDataPath(path)) { PROFILE_START(dumpDirectories); @@ -1247,7 +1284,7 @@ static bool recurseDumpPathCache(const char* curPath, Vector //----------------------------------------------------------------------------- bool Platform::dumpPath(const char *path, Vector& fileVector, S32 depth) { - if (isCachePath(path)) + if (isCachePath(path) || isUserDataPath(path)) { PROFILE_START(dumpPath); const S32 len = dStrlen(path) + 1; diff --git a/engine/source/platformAndroid/AndroidInput.cpp b/engine/source/platformAndroid/AndroidInput.cpp index 0416e786e..fc45a7309 100755 --- a/engine/source/platformAndroid/AndroidInput.cpp +++ b/engine/source/platformAndroid/AndroidInput.cpp @@ -411,7 +411,7 @@ const char* Platform::getClipboard() //----------------------------------------------------------------------------- bool Platform::setClipboard(const char *text) { - return NULL;//no clipboard on Android + return false;//no clipboard on Android } #pragma mark ---- Cursor Functions ---- diff --git a/engine/source/platformAndroid/AndroidNet.cpp b/engine/source/platformAndroid/AndroidNet.cpp deleted file mode 100755 index a0f755ee2..000000000 --- a/engine/source/platformAndroid/AndroidNet.cpp +++ /dev/null @@ -1,885 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platformAndroid/platformAndroid.h" -#include "platform/platform.h" -#include "platform/event.h" -#include "platform/platformNetAsync.unix.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -// Header clean-up by William Taysom -#include - -// IPX fixes from William Taysom. -#define IPX_NODE_LEN 6 - -// for 10.2 compatability... -#ifndef socklen_t -#define socklen_t unsigned int -#endif - -struct sockaddr_ipx -{ - sa_family_t sipx_family; - U16 sipx_port; - U32 sipx_network; - unsigned char sipx_node[IPX_NODE_LEN]; - U8 sipx_type; - unsigned char sipx_zero; /* 16 byte fill */ -}; -// end wtaysom changes (May 26, 2004) - -#include - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" -#include "collection/vector.h" - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static int ipxSocket = InvalidSocket; -static int udpSocket = InvalidSocket; - -// local enum for socket states for polled sockets -enum SocketState -{ - InvalidState, - Connected, - ConnectionPending, - Listening, - NameLookupRequired -}; - -// the Socket structure helps us keep track of the -// above states -struct Socket -{ - Socket() - { - fd = InvalidSocket; - state = InvalidState; - remoteAddr[0] = 0; - remotePort = -1; - } - - NetSocket fd; - S32 state; - char remoteAddr[256]; - S32 remotePort; -}; - -// list of polled sockets -static Vector gPolledSockets; - -static Socket* addPolledSocket(NetSocket& fd, S32 state, - char* remoteAddr = NULL, S32 port = -1) -{ - Socket* sock = new Socket(); - sock->fd = fd; - sock->state = state; - if (remoteAddr) - dStrcpy(sock->remoteAddr, remoteAddr); - if (port != -1) - sock->remotePort = port; - gPolledSockets.push_back(sock); - return sock; -} - -enum { - MaxConnections = 1024, -}; - - -bool netSocketWaitForWritable(NetSocket fd, S32 timeoutMs) -{ - fd_set writefds; - timeval timeout; - - FD_ZERO(&writefds); - FD_SET( fd, &writefds ); - - timeout.tv_sec = timeoutMs / 1000; - timeout.tv_usec = ( timeoutMs % 1000 ) * 1000; - - if( select(fd + 1, NULL, &writefds, NULL, &timeout) > 0 ) - return true; - - return false; -} - -bool Net::init() -{ - NetAsync::startAsync(); - return(true); -} - -void Net::shutdown() -{ - while (gPolledSockets.size() > 0) - closeConnectTo(gPolledSockets[0]->fd); - - closePort(); - NetAsync::stopAsync(); -} - -static void netToIPSocketAddress(const NetAddress *address, struct sockaddr_in *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(struct sockaddr_in)); - sockAddr->sin_family = AF_INET; - sockAddr->sin_port = htons(address->port); - char tAddr[20]; - dSprintf(tAddr, 20, "%d.%d.%d.%d\n", address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3]); -//fprintf(stdout,"netToIPSocketAddress(): %s\n",tAddr);fflush(NULL); - sockAddr->sin_addr.s_addr = inet_addr(tAddr); -} - -static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) -{ - address->type = NetAddress::IPAddress; - address->port = htons(sockAddr->sin_port); - char *tAddr; - tAddr = inet_ntoa(sockAddr->sin_addr); -//fprintf(stdout,"IPSocketToNetAddress(): %s\n",tAddr);fflush(NULL); - U8 nets[4]; - nets[0] = atoi(strtok(tAddr, ".")); - nets[1] = atoi(strtok(NULL, ".")); - nets[2] = atoi(strtok(NULL, ".")); - nets[3] = atoi(strtok(NULL, ".")); -//fprintf(stdout,"0 = %d, 1 = %d, 2 = %d, 3 = %d\n", nets[0], nets[1], nets[2], nets[3]); - address->netNum[0] = nets[0]; - address->netNum[1] = nets[1]; - address->netNum[2] = nets[2]; - address->netNum[3] = nets[3]; -} - -static void netToIPXSocketAddress(const NetAddress *address, sockaddr_ipx *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(sockaddr_ipx)); - sockAddr->sipx_family = AF_INET; - sockAddr->sipx_port = htons(address->port); - sockAddr->sipx_network = address->netNum[0]; - sockAddr->sipx_node[0] = address->nodeNum[0]; - sockAddr->sipx_node[1] = address->nodeNum[1]; - sockAddr->sipx_node[2] = address->nodeNum[2]; - sockAddr->sipx_node[3] = address->nodeNum[3]; - sockAddr->sipx_node[4] = address->nodeNum[4]; - sockAddr->sipx_node[5] = address->nodeNum[5]; -} - -NetSocket Net::openListenPort(U16 port) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - NetSocket sock = openSocket(); - if (sock == InvalidSocket) - { - Con::errorf("Unable to open listen socket: %s", strerror(errno)); - return InvalidSocket; - } - - if (bind(sock, port) != NoError) - { - Con::errorf("Unable to bind port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - if (listen(sock, 4) != NoError) - { - Con::errorf("Unable to listen on port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - - setBlocking(sock, false); - addPolledSocket(sock, Listening); -#ifdef TORQUE_ALLOW_JOURNALING - if (Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - if(!dStrnicmp(addressString, "ipx:", 4)) - return InvalidSocket; - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - char remoteAddr[256]; - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - - U16 port; - if(portString) - { - *portString++ = 0; - port = htons(dAtoi(portString)); - } - else - port = htons(defaultPort); - - if(!dStricmp(remoteAddr, "broadcast")) - return InvalidSocket; - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - NetSocket sock = openSocket(); - setBlocking(sock, false); - - sockaddr_in ipAddr; - dMemset(&ipAddr, 0, sizeof(ipAddr)); - - if (inet_aton(remoteAddr, &ipAddr.sin_addr) != 0) - { - ipAddr.sin_port = port; - ipAddr.sin_family = AF_INET; - if(::connect(sock, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1 && - errno != EINPROGRESS) - { - Con::errorf("Error connecting %s: %s", - addressString, strerror(errno)); - ::close(sock); - sock = InvalidSocket; - } - if(sock != InvalidSocket) { - // add this socket to our list of polled sockets - addPolledSocket(sock, ConnectionPending); - } - } - else - { - // need to do an asynchronous name lookup. first, add the socket - // to the polled list - addPolledSocket(sock, NameLookupRequired, remoteAddr, port); - // queue the lookup - gNetAsync.queueLookup(remoteAddr, sock); - } -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -void Net::closeConnectTo(NetSocket sock) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return; -#endif //TORQUE_ALLOW_JOURNALING - - // if this socket is in the list of polled sockets, remove it - for (int i = 0; i < gPolledSockets.size(); ++i) - if (gPolledSockets[i]->fd == sock) - { - delete gPolledSockets[i]; - gPolledSockets.erase(i); - break; - } - - closeSocket(sock); -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 e; - Game->journalRead(&e); - - return (Net::Error) e; - } -#endif //TORQUE_ALLOW_JOURNALING - - Net::Error e = send(socket, buffer, bufferSize); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(e)); -#endif //TORQUE_ALLOW_JOURNALING - - return e; -} - -bool Net::openPort(S32 port) -{ - if(udpSocket != InvalidSocket) - close(udpSocket); - if(ipxSocket != InvalidSocket) - close(ipxSocket); - - udpSocket = socket(AF_INET, SOCK_DGRAM, 0); - ipxSocket = socket(AF_IPX, SOCK_DGRAM, 0); - - if(udpSocket != InvalidSocket) - { - Net::Error error; - error = bind(udpSocket, port); - if(error == NoError) - error = setBufferSize(udpSocket, 32768); - if(error == NoError) - error = setBroadcast(udpSocket, true); - if(error == NoError) - error = setBlocking(udpSocket, false); - if(error == NoError) - Con::printf("UDP initialized on port %d", port); - else - { - close(udpSocket); - udpSocket = InvalidSocket; - Con::printf("Unable to initialize UDP - error %d", error); - } - } - if(ipxSocket != InvalidSocket) - { - Net::Error error = NoError; - sockaddr_ipx ipxAddress; - memset((char *)&ipxAddress, 0, sizeof(ipxAddress)); - ipxAddress.sipx_family = AF_IPX; - ipxAddress.sipx_port = htons(port); - S32 err = ::bind(ipxSocket, (struct sockaddr *)&ipxAddress, sizeof(ipxAddress)); - if(err) - error = getLastError(); - if(error == NoError) - error = setBufferSize(ipxSocket, 32768); - if(error == NoError) - error = setBroadcast(ipxSocket, true); - if(error == NoError) - error = setBlocking(ipxSocket, false); - if(error == NoError) - Con::printf("IPX initialized on port %d", port); - else - { - close(ipxSocket); - ipxSocket = InvalidSocket; - Con::printf("Unable to initialize IPX - error %d", error); - } - } - netPort = port; - return ipxSocket != InvalidSocket || udpSocket != InvalidSocket; -} - -void Net::closePort() -{ - if(ipxSocket != InvalidSocket) - close(ipxSocket); - if(udpSocket != InvalidSocket) - close(udpSocket); -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return NoError; -#endif //TORQUE_ALLOW_JOURNALING - - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - if(::sendto(udpSocket, (const char*)buffer, bufferSize, 0, - (sockaddr *) &ipAddr, sizeof(sockaddr_in)) == -1) - return getLastError(); - else - return NoError; - } - - return NoError; -} - -void Net::process() -{ - sockaddr sa; - - PacketReceiveEvent receiveEvent; - for(;;) - { - S32 addrLen = sizeof(sa); - S32 bytesRead = -1; - if(udpSocket != InvalidSocket) - bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - if(bytesRead == -1 && ipxSocket != InvalidSocket) - { - addrLen = sizeof(sa); - bytesRead = recvfrom(ipxSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - } - - if(bytesRead == -1) - break; - - if(sa.sa_family == AF_INET) - IPSocketToNetAddress((sockaddr_in *) &sa, &receiveEvent.sourceAddress); - else - continue; - - NetAddress &na = receiveEvent.sourceAddress; - if(na.type == NetAddress::IPAddress && - na.netNum[0] == 127 && - na.netNum[1] == 0 && - na.netNum[2] == 0 && - na.netNum[3] == 1 && - na.port == netPort) - continue; - if(bytesRead <= 0) - continue; - receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - - // process the polled sockets. This blob of code performs functions - // similar to WinsockProc in winNet.cc - - if (gPolledSockets.size() == 0) - return; - - static ConnectedNotifyEvent notifyEvent; - static ConnectedAcceptEvent acceptEvent; - static ConnectedReceiveEvent cReceiveEvent; - - S32 optval; - socklen_t optlen = sizeof(U32); - S32 bytesRead; - Net::Error err; - bool removeSock = false; - Socket *currentSock = NULL; - sockaddr_in ipAddr; - NetSocket incoming = InvalidSocket; - char out_h_addr[1024]; - int out_h_length = 0; - - for (S32 i = 0; i < gPolledSockets.size(); - /* no increment, this is done at end of loop body */) - { - removeSock = false; - currentSock = gPolledSockets[i]; - switch (currentSock->state) - { - case InvalidState: - Con::errorf("Error, InvalidState socket in polled sockets list"); - break; - case ConnectionPending: - notifyEvent.tag = currentSock->fd; - // see if it is now connected - if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR, - &optval, - (S32*)&optlen) == -1) - { - Con::errorf("Error getting socket options: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - else - { - if (optval == EINPROGRESS) - // still connecting... - break; - - if (optval == 0) - { - // poll for writable status to be sure we're connected. - bool ready = netSocketWaitForWritable(currentSock->fd,0); - if(!ready) - break; - - // connected. - notifyEvent.state = ConnectedNotifyEvent::Connected; - Game->postEvent(notifyEvent); - currentSock->state = Connected; - } - else - { - // some kind of error - Con::errorf("Error connecting: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - break; - case Connected: - bytesRead = 0; - // try to get some data - err = Net::recv(currentSock->fd, cReceiveEvent.data, MaxPacketDataSize, &bytesRead); - if(err == Net::NoError) - { - if (bytesRead > 0) - { - // got some data, post it - cReceiveEvent.tag = currentSock->fd; - cReceiveEvent.size = ConnectedReceiveEventHeaderSize + - bytesRead; - Game->postEvent(cReceiveEvent); - } - else - { - // zero bytes read means EOF - if (bytesRead < 0) - // ack! this shouldn't happen - Con::errorf("Unexpected error on socket: %s", - strerror(errno)); - - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - else if (err != Net::NoError && err != Net::WouldBlock) - { - Con::errorf("Error reading from socket: %s", strerror(errno)); - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - break; - case NameLookupRequired: - // is the lookup complete? - if (!gNetAsync.checkLookup( - currentSock->fd, out_h_addr, &out_h_length, - sizeof(out_h_addr))) - break; - - notifyEvent.tag = currentSock->fd; - if (out_h_length == -1) - { - Con::errorf("DNS lookup failed: %s", currentSock->remoteAddr); - notifyEvent.state = ConnectedNotifyEvent::DNSFailed; - removeSock = true; - } - else - { - // try to connect - dMemcpy(&(ipAddr.sin_addr.s_addr), out_h_addr, out_h_length); - ipAddr.sin_port = currentSock->remotePort; - ipAddr.sin_family = AF_INET; - if(::connect(currentSock->fd, (struct sockaddr *)&ipAddr, - sizeof(ipAddr)) == -1) - { - if (errno == EINPROGRESS) - { - notifyEvent.state = ConnectedNotifyEvent::DNSResolved; - currentSock->state = ConnectionPending; - } - else - { - Con::errorf("Error connecting to %s: %s", - currentSock->remoteAddr, strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - removeSock = true; - } - } - else - { - notifyEvent.state = ConnectedNotifyEvent::Connected; - currentSock->state = Connected; - } - } - Game->postEvent(notifyEvent); - break; - case Listening: - incoming = - Net::accept(currentSock->fd, &acceptEvent.address); - if(incoming != InvalidSocket) - { - acceptEvent.portTag = currentSock->fd; - acceptEvent.connectionTag = incoming; - setBlocking(incoming, false); - addPolledSocket(incoming, Connected); - Game->postEvent(acceptEvent); - } - break; - } - - // only increment index if we're not removing the connection, since - // the removal will shift the indices down by one - if (removeSock) - closeConnectTo(currentSock->fd); - else - i++; - } -} - -NetSocket Net::openSocket() -{ - int retSocket; - retSocket = socket(AF_INET, SOCK_STREAM, 0); - - if(retSocket == InvalidSocket) - return InvalidSocket; - else - return retSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - if(socket != InvalidSocket) - { - // if we're quitting, allow the OS to close the sockets. - // this is here to work around a bug in close(). - if(platState.quit) - return NoError; - - if(!close(socket)) - return NoError; - else - return getLastError(); - } - else - return NotASocket; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - if(address->type != NetAddress::IPAddress) - return WrongProtocolType; - sockaddr_in socketAddress; - netToIPSocketAddress(address, &socketAddress); - if(!::connect(socket, (sockaddr *) &socketAddress, sizeof(socketAddress))) - return NoError; - return getLastError(); -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - if(!::listen(socket, backlog)) - return NoError; - return getLastError(); -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - sockaddr_in socketAddress; - S32 addrLen = sizeof(socketAddress); - - int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen); - if(retVal != InvalidSocket) - { - IPSocketToNetAddress(&socketAddress, remoteAddress); - return retVal; - } - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - S32 error; - - sockaddr_in socketAddress; - dMemset((char *)&socketAddress, 0, sizeof(socketAddress)); - socketAddress.sin_family = AF_INET; - // It's entirely possible that there are two NIC cards. - // We let the user specify which one the server runs on. - - // thanks to [TPG]P1aGu3 for the name - const char* serverIP = Con::getVariable( "Pref::Net::BindAddress" ); - // serverIP is guaranteed to be non-0. - AssertFatal( serverIP, "serverIP is NULL!" ); - - if( serverIP[0] != '\0' ) { - // we're not empty - socketAddress.sin_addr.s_addr = inet_addr( serverIP ); - - if( socketAddress.sin_addr.s_addr != INADDR_NONE ) { - Con::printf( "Binding server port to %s", serverIP ); - } else { - Con::warnf( ConsoleLogEntry::General, - "inet_addr() failed for %s while binding!", - serverIP ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - } else { - Con::printf( "Binding server port to default IP" ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - socketAddress.sin_port = htons(port); - error = ::bind(socket, (sockaddr *) &socketAddress, sizeof(socketAddress)); - - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - S32 error; - error = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - error = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - S32 bc = broadcast; - S32 error = setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - int notblock = !blockingIO; - S32 error = ioctl(socket, FIONBIO, ¬block); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - errno = 0; - S32 bytesWritten = ::send(socket, (const char*)buffer, bufferSize, 0); - if(bytesWritten == -1) - Con::errorf("Could not write to socket. Error: %s",strerror(errno)); - - return getLastError(); -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - *bytesRead = ::recv(socket, (char*)buffer, bufferSize, 0); - if(*bytesRead == -1) - return getLastError(); - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - // assume IP if it doesn't have ipx: at the front. - - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - - sockaddr_in ipAddr; - char remoteAddr[256]; - if(strlen(addressString) > 255) - return false; - - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - if(portString) - *portString++ = '\0'; - - struct hostent *hp; - if(!dStricmp(remoteAddr, "broadcast")) - ipAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); - else - { - if (inet_aton(remoteAddr,&ipAddr.sin_addr) == 0) // error - { - if((hp = gethostbyname(remoteAddr)) == 0) - return false; - else - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(in_addr)); - } - } - if(portString) - ipAddr.sin_port = htons(dAtoi(portString)); - else - ipAddr.sin_port = htons(defaultPort); - ipAddr.sin_family = AF_INET; - IPSocketToNetAddress(&ipAddr, address); - return true; -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - - if(ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST)) - dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); - else - dSprintf(addressString, 256, "IP:%s:%d", inet_ntoa(ipAddr.sin_addr), - ntohs(ipAddr.sin_port)); -// dSprintf(addressString, 256, "IP:%d:%d", ipAddr.sin_addr.s_addr, -// ntohs(ipAddr.sin_port)); - } - else - { - return; - dSprintf(addressString, 256, "IPX:%.2X%.2X%.2X%.2X:%.2X%.2X%.2X%.2X%.2X%.2X:%d", - address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3], - address->nodeNum[0], address->nodeNum[1], address->nodeNum[2], address->nodeNum[3], address->nodeNum[4], address->nodeNum[5], - address->port); - } -} - -Net::Error getLastError() -{ - if (errno == EAGAIN) - return Net::WouldBlock; - if (errno == 0) - return Net::NoError; - - return Net::UnknownError; -} diff --git a/engine/source/platformAndroid/AndroidStrings.cpp b/engine/source/platformAndroid/AndroidStrings.cpp index ba602a7fb..f5375717f 100755 --- a/engine/source/platformAndroid/AndroidStrings.cpp +++ b/engine/source/platformAndroid/AndroidStrings.cpp @@ -258,12 +258,12 @@ U32 dStrcspn(const char *str, const char *set) } -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1,str2); } -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr(str1,str2); } diff --git a/engine/source/platformAndroid/AndroidThread.cpp b/engine/source/platformAndroid/AndroidThread.cpp index 31ee3d03a..a4de09ec3 100755 --- a/engine/source/platformAndroid/AndroidThread.cpp +++ b/engine/source/platformAndroid/AndroidThread.cpp @@ -133,17 +133,17 @@ bool Thread::isAlive() return true; // we could not get the lock, it must be alive. } -U32 Thread::getId() +ThreadIdent Thread::getId() { return mData->mThreadID; } -U32 ThreadManager::getCurrentThreadId() +ThreadIdent ThreadManager::getCurrentThreadId() { return (U32)pthread_self(); } -bool ThreadManager::compare(U32 threadId_1, U32 threadId_2) +bool ThreadManager::compare(ThreadIdent threadId_1, ThreadIdent threadId_2) { return (bool)pthread_equal((pthread_t)threadId_1, (pthread_t)threadId_2); } diff --git a/engine/source/platformAndroid/T2DActivity.cpp b/engine/source/platformAndroid/T2DActivity.cpp index f681d5e31..d87d2675c 100755 --- a/engine/source/platformAndroid/T2DActivity.cpp +++ b/engine/source/platformAndroid/T2DActivity.cpp @@ -1225,6 +1225,7 @@ void android_main(struct android_app* state) { //store the cache dir activity.loadCacheDir(); + activity.loadInternalDir(); //enumerate fonts activity.enumerateFonts(); @@ -2622,4 +2623,97 @@ void adprintf(const char* fmt,...) { __android_log_print(ANDROID_LOG_INFO, "Torque2D", "%s", ss.str().c_str()); } +void T2DActivity::loadInternalDir(){ + + // Attaches the current thread to the JVM. + jint lResult; + jint lFlags = 0; + JavaVM* lJavaVM = platState.engine->app->activity->vm; + JNIEnv* lJNIEnv = platState.engine->app->activity->env; + + JavaVMAttachArgs lJavaVMAttachArgs; + lJavaVMAttachArgs.version = JNI_VERSION_1_6; + lJavaVMAttachArgs.name = "NativeThread"; + lJavaVMAttachArgs.group = NULL; + + lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs); + if (lResult == JNI_ERR) { + return; + } + + // Retrieves NativeActivity. + jobject lNativeActivity = platState.engine->app->activity->clazz; + jclass ClassNativeActivity = lJNIEnv->GetObjectClass(lNativeActivity); + + jmethodID getFilesDir = lJNIEnv->GetMethodID(ClassNativeActivity, "getFilesDir", "()Ljava/io/File;"); + jobject file = lJNIEnv->CallObjectMethod(platState.engine->app->activity->clazz, getFilesDir); + jclass fileClass = lJNIEnv->FindClass("java/io/File"); + jmethodID getAbsolutePath = lJNIEnv->GetMethodID(fileClass, "getAbsolutePath", "()Ljava/lang/String;"); + jstring jpath = (jstring)lJNIEnv->CallObjectMethod(file, getAbsolutePath); + const char* app_dir = lJNIEnv->GetStringUTFChars(jpath, NULL); + + strcpy(internalDir, app_dir); + internalDir[strlen(app_dir)] = '\0'; + + lJNIEnv->ReleaseStringUTFChars(jpath, app_dir); + + // Finished with the JVM. + lJavaVM->DetachCurrentThread(); +} + + +char* _AndroidLoadInternalFile(const char* fn, U32 *size) +{ + // Attaches the current thread to the JVM. + jint lResult; + jint lFlags = 0; + + JavaVM* lJavaVM = engine.app->activity->vm; + JNIEnv* lJNIEnv = engine.app->activity->env; + + JavaVMAttachArgs lJavaVMAttachArgs; + lJavaVMAttachArgs.version = JNI_VERSION_1_6; + lJavaVMAttachArgs.name = "NativeThread"; + lJavaVMAttachArgs.group = NULL; + + lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs); + if (lResult == JNI_ERR) { + return NULL; + } + + // Retrieves NativeActivity. + jobject lNativeActivity = engine.app->activity->clazz; + jclass ClassNativeActivity = lJNIEnv->GetObjectClass(lNativeActivity); + + jmethodID getClassLoader = lJNIEnv->GetMethodID(ClassNativeActivity,"getClassLoader", "()Ljava/lang/ClassLoader;"); + jobject cls = lJNIEnv->CallObjectMethod(lNativeActivity, getClassLoader); + jclass classLoader = lJNIEnv->FindClass("java/lang/ClassLoader"); + jmethodID findClass = lJNIEnv->GetMethodID(classLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); + jstring strClassName = lJNIEnv->NewStringUTF("com.garagegames.torque2d.FileWalker"); + jclass FileWalkerClass = (jclass)lJNIEnv->CallObjectMethod(cls, findClass, strClassName); + jstring fileName = lJNIEnv->NewStringUTF(fn); + jmethodID MethodFileWalker = lJNIEnv->GetStaticMethodID(FileWalkerClass, "LoadInternalFile", "(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;"); + jstring jcontent = (jstring)lJNIEnv->CallStaticObjectMethod(FileWalkerClass, MethodFileWalker, lNativeActivity, fileName); + + lJNIEnv->DeleteLocalRef(strClassName); + lJNIEnv->DeleteLocalRef(fileName); + *size = 0; + char *buffer = NULL; + if (jcontent != NULL) + { + const char* value = lJNIEnv->GetStringUTFChars(jcontent, NULL); + *size = strlen(value); + buffer = new char[*size + 1]; + strcpy(buffer, value); + buffer[*size] = '\0'; + + lJNIEnv->ReleaseStringUTFChars(jcontent, value); + lJavaVM->DetachCurrentThread(); + return buffer; + } + + lJavaVM->DetachCurrentThread(); + return buffer; +} + diff --git a/engine/source/platformAndroid/T2DActivity.h b/engine/source/platformAndroid/T2DActivity.h index 1dbef3f82..462adce0a 100755 --- a/engine/source/platformAndroid/T2DActivity.h +++ b/engine/source/platformAndroid/T2DActivity.h @@ -41,6 +41,7 @@ extern int _AndroidGetScreenWidth(); extern int _AndroidGetScreenHeight(); extern S32 _AndroidGameGetOrientation(); extern char* _AndroidLoadFile(const char* fileName, U32 *size); +extern char* _AndroidLoadInternalFile(const char* fileName, U32 *size); extern void android_InitDirList(const char* dir); extern void android_GetNextDir(const char* pdir, char *dir); extern void android_GetNextFile(const char* pdir, char *file); @@ -93,6 +94,7 @@ class T2DActivity { bool isLayedOut; char cacheDir[2048]; + char internalDir[2048]; bool accelerometerActive; @@ -113,6 +115,11 @@ class T2DActivity { char *getCacheDir() { return cacheDir; } + void loadInternalDir(); + char *getInternalDir() { + return internalDir; + } + void update(); void finishShutdown(); void finishGLSetup(); diff --git a/engine/compilers/android/NDKKeyboardBugFix/android_native_app_glue.c b/engine/source/platformAndroid/android_native_app_glue.c similarity index 99% rename from engine/compilers/android/NDKKeyboardBugFix/android_native_app_glue.c rename to engine/source/platformAndroid/android_native_app_glue.c index 263982685..5fef155c3 100644 --- a/engine/compilers/android/NDKKeyboardBugFix/android_native_app_glue.c +++ b/engine/source/platformAndroid/android_native_app_glue.c @@ -17,11 +17,13 @@ #include +#include #include #include #include #include + #include "android_native_app_glue.h" #include diff --git a/engine/source/platformAndroid/android_native_app_glue.h b/engine/source/platformAndroid/android_native_app_glue.h new file mode 100644 index 000000000..c19ada437 --- /dev/null +++ b/engine/source/platformAndroid/android_native_app_glue.h @@ -0,0 +1,349 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef _ANDROID_NATIVE_APP_GLUE_H +#define _ANDROID_NATIVE_APP_GLUE_H + +#include +#include +#include + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The native activity interface provided by + * is based on a set of application-provided callbacks that will be called + * by the Activity's main thread when certain events occur. + * + * This means that each one of this callbacks _should_ _not_ block, or they + * risk having the system force-close the application. This programming + * model is direct, lightweight, but constraining. + * + * The 'threaded_native_app' static library is used to provide a different + * execution model where the application can implement its own main event + * loop in a different thread instead. Here's how it works: + * + * 1/ The application must provide a function named "android_main()" that + * will be called when the activity is created, in a new thread that is + * distinct from the activity's main thread. + * + * 2/ android_main() receives a pointer to a valid "android_app" structure + * that contains references to other important objects, e.g. the + * ANativeActivity obejct instance the application is running in. + * + * 3/ the "android_app" object holds an ALooper instance that already + * listens to two important things: + * + * - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX + * declarations below. + * + * - input events coming from the AInputQueue attached to the activity. + * + * Each of these correspond to an ALooper identifier returned by + * ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT, + * respectively. + * + * Your application can use the same ALooper to listen to additional + * file-descriptors. They can either be callback based, or with return + * identifiers starting with LOOPER_ID_USER. + * + * 4/ Whenever you receive a LOOPER_ID_MAIN or LOOPER_ID_INPUT event, + * the returned data will point to an android_poll_source structure. You + * can call the process() function on it, and fill in android_app->onAppCmd + * and android_app->onInputEvent to be called for your own processing + * of the event. + * + * Alternatively, you can call the low-level functions to read and process + * the data directly... look at the process_cmd() and process_input() + * implementations in the glue to see how to do this. + * + * See the sample named "native-activity" that comes with the NDK with a + * full usage example. Also look at the JavaDoc of NativeActivity. + */ + +struct android_app; + +/** + * Data associated with an ALooper fd that will be returned as the "outData" + * when that source has data ready. + */ +struct android_poll_source { + // The identifier of this source. May be LOOPER_ID_MAIN or + // LOOPER_ID_INPUT. + int32_t id; + + // The android_app this ident is associated with. + struct android_app* app; + + // Function to call to perform the standard processing of data from + // this source. + void (*process)(struct android_app* app, struct android_poll_source* source); +}; + +/** + * This is the interface for the standard glue code of a threaded + * application. In this model, the application's code is running + * in its own thread separate from the main thread of the process. + * It is not required that this thread be associated with the Java + * VM, although it will need to be in order to make JNI calls any + * Java objects. + */ +struct android_app { + // The application can place a pointer to its own state object + // here if it likes. + void* userData; + + // Fill this in with the function to process main app commands (APP_CMD_*) + void (*onAppCmd)(struct android_app* app, int32_t cmd); + + // Fill this in with the function to process input events. At this point + // the event has already been pre-dispatched, and it will be finished upon + // return. Return 1 if you have handled the event, 0 for any default + // dispatching. + int32_t (*onInputEvent)(struct android_app* app, AInputEvent* event); + + // The ANativeActivity object instance that this app is running in. + ANativeActivity* activity; + + // The current configuration the app is running in. + AConfiguration* config; + + // This is the last instance's saved state, as provided at creation time. + // It is NULL if there was no state. You can use this as you need; the + // memory will remain around until you call android_app_exec_cmd() for + // APP_CMD_RESUME, at which point it will be freed and savedState set to NULL. + // These variables should only be changed when processing a APP_CMD_SAVE_STATE, + // at which point they will be initialized to NULL and you can malloc your + // state and place the information here. In that case the memory will be + // freed for you later. + void* savedState; + size_t savedStateSize; + + // The ALooper associated with the app's thread. + ALooper* looper; + + // When non-NULL, this is the input queue from which the app will + // receive user input events. + AInputQueue* inputQueue; + + // When non-NULL, this is the window surface that the app can draw in. + ANativeWindow* window; + + // Current content rectangle of the window; this is the area where the + // window's content should be placed to be seen by the user. + ARect contentRect; + + // Current state of the app's activity. May be either APP_CMD_START, + // APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below. + int activityState; + + // This is non-zero when the application's NativeActivity is being + // destroyed and waiting for the app thread to complete. + int destroyRequested; + + // ------------------------------------------------- + // Below are "private" implementation of the glue code. + + pthread_mutex_t mutex; + pthread_cond_t cond; + + int msgread; + int msgwrite; + + pthread_t thread; + + struct android_poll_source cmdPollSource; + struct android_poll_source inputPollSource; + + int running; + int stateSaved; + int destroyed; + int redrawNeeded; + AInputQueue* pendingInputQueue; + ANativeWindow* pendingWindow; + ARect pendingContentRect; +}; + +enum { + /** + * Looper data ID of commands coming from the app's main thread, which + * is returned as an identifier from ALooper_pollOnce(). The data for this + * identifier is a pointer to an android_poll_source structure. + * These can be retrieved and processed with android_app_read_cmd() + * and android_app_exec_cmd(). + */ + LOOPER_ID_MAIN = 1, + + /** + * Looper data ID of events coming from the AInputQueue of the + * application's window, which is returned as an identifier from + * ALooper_pollOnce(). The data for this identifier is a pointer to an + * android_poll_source structure. These can be read via the inputQueue + * object of android_app. + */ + LOOPER_ID_INPUT = 2, + + /** + * Start of user-defined ALooper identifiers. + */ + LOOPER_ID_USER = 3, +}; + +enum { + /** + * Command from main thread: the AInputQueue has changed. Upon processing + * this command, android_app->inputQueue will be updated to the new queue + * (or NULL). + */ + APP_CMD_INPUT_CHANGED, + + /** + * Command from main thread: a new ANativeWindow is ready for use. Upon + * receiving this command, android_app->window will contain the new window + * surface. + */ + APP_CMD_INIT_WINDOW, + + /** + * Command from main thread: the existing ANativeWindow needs to be + * terminated. Upon receiving this command, android_app->window still + * contains the existing window; after calling android_app_exec_cmd + * it will be set to NULL. + */ + APP_CMD_TERM_WINDOW, + + /** + * Command from main thread: the current ANativeWindow has been resized. + * Please redraw with its new size. + */ + APP_CMD_WINDOW_RESIZED, + + /** + * Command from main thread: the system needs that the current ANativeWindow + * be redrawn. You should redraw the window before handing this to + * android_app_exec_cmd() in order to avoid transient drawing glitches. + */ + APP_CMD_WINDOW_REDRAW_NEEDED, + + /** + * Command from main thread: the content area of the window has changed, + * such as from the soft input window being shown or hidden. You can + * find the new content rect in android_app::contentRect. + */ + APP_CMD_CONTENT_RECT_CHANGED, + + /** + * Command from main thread: the app's activity window has gained + * input focus. + */ + APP_CMD_GAINED_FOCUS, + + /** + * Command from main thread: the app's activity window has lost + * input focus. + */ + APP_CMD_LOST_FOCUS, + + /** + * Command from main thread: the current device configuration has changed. + */ + APP_CMD_CONFIG_CHANGED, + + /** + * Command from main thread: the system is running low on memory. + * Try to reduce your memory use. + */ + APP_CMD_LOW_MEMORY, + + /** + * Command from main thread: the app's activity has been started. + */ + APP_CMD_START, + + /** + * Command from main thread: the app's activity has been resumed. + */ + APP_CMD_RESUME, + + /** + * Command from main thread: the app should generate a new saved state + * for itself, to restore from later if needed. If you have saved state, + * allocate it with malloc and place it in android_app.savedState with + * the size in android_app.savedStateSize. The will be freed for you + * later. + */ + APP_CMD_SAVE_STATE, + + /** + * Command from main thread: the app's activity has been paused. + */ + APP_CMD_PAUSE, + + /** + * Command from main thread: the app's activity has been stopped. + */ + APP_CMD_STOP, + + /** + * Command from main thread: the app's activity is being destroyed, + * and waiting for the app thread to clean up and exit before proceeding. + */ + APP_CMD_DESTROY, +}; + +/** + * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next + * app command message. + */ +int8_t android_app_read_cmd(struct android_app* android_app); + +/** + * Call with the command returned by android_app_read_cmd() to do the + * initial pre-processing of the given command. You can perform your own + * actions for the command after calling this function. + */ +void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd); + +/** + * Call with the command returned by android_app_read_cmd() to do the + * final post-processing of the given command. You must have done your own + * actions for the command before calling this function. + */ +void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd); + +/** + * Dummy function you can call to ensure glue code isn't stripped. + */ +void app_dummy(); + +/** + * This is the function that application code must implement, representing + * the main entry to the app. + */ +extern void android_main(struct android_app* app); + +#ifdef __cplusplus +} +#endif + +#endif /* _ANDROID_NATIVE_APP_GLUE_H */ \ No newline at end of file diff --git a/engine/source/platformEmscripten/EmscriptenNet.cpp b/engine/source/platformEmscripten/EmscriptenNet.cpp deleted file mode 100755 index 6bb41cd78..000000000 --- a/engine/source/platformEmscripten/EmscriptenNet.cpp +++ /dev/null @@ -1,198 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// Portions Copyright (c) 2014 James S Urquhart -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platformEmscripten/platformEmscripten.h" -#include "platform/platform.h" -#include "platform/event.h" -#include "platform/platformNetAsync.unix.h" - -#include -#include -#include - -// Header clean-up by William Taysom -#include - -// IPX fixes from William Taysom. -#define IPX_NODE_LEN 6 - -// for 10.2 compatability... -#ifndef socklen_t -#define socklen_t unsigned int -#endif - -#include - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" -#include "collection/vector.h" - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static int ipxSocket = InvalidSocket; -static int udpSocket = InvalidSocket; - -// local enum for socket states for polled sockets -enum SocketState -{ - InvalidState, - Connected, - ConnectionPending, - Listening, - NameLookupRequired -}; - -bool Net::init() -{ - return(true); -} - -void Net::shutdown() -{ -} - -NetSocket Net::openListenPort(U16 port) -{ - Con::errorf("Sockets not implemented on Emscripten"); - return InvalidSocket; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - Con::errorf("Sockets not implemented on Emscripten"); - return InvalidSocket; -} - -void Net::closeConnectTo(NetSocket sock) -{ -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize) -{ - return NoError; -} - -bool Net::openPort(S32 port) -{ - return false; -} - -void Net::closePort() -{ -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ - return NoError; -} - -void Net::process() -{ -} - -NetSocket Net::openSocket() -{ - return InvalidSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - return NoError; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - return NoError; -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - return NoError; -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - return NoError; -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - return NoError; -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - return NoError; -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - return NoError; -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - return NoError; -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - return false; -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - addressString[0] = '\0'; -} - -Net::Error getLastError() -{ - return Net::UnknownError; -} diff --git a/engine/source/platformEmscripten/EmscriptenStrings.cpp b/engine/source/platformEmscripten/EmscriptenStrings.cpp index 963cbfce2..05a413c1b 100755 --- a/engine/source/platformEmscripten/EmscriptenStrings.cpp +++ b/engine/source/platformEmscripten/EmscriptenStrings.cpp @@ -249,12 +249,12 @@ dsize_t dStrcspn(const char *str, const char *set) } -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1,str2); } -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr(str1,str2); } diff --git a/engine/source/platformOSX/osxCocoaUtilities.mm b/engine/source/platformOSX/osxCocoaUtilities.mm index 024d0847a..b508a4c00 100755 --- a/engine/source/platformOSX/osxCocoaUtilities.mm +++ b/engine/source/platformOSX/osxCocoaUtilities.mm @@ -55,7 +55,7 @@ - (void)setFilters:(StringTableEntry)filters else { // detect *.* - if (dStrstr((const char *) token, "*.*")) + if (dStrstr(token, "*.*")) { fileTypes.any = true; } diff --git a/engine/source/platformOSX/osxNetwork.mm b/engine/source/platformOSX/osxNetwork.mm deleted file mode 100755 index 5197e22b0..000000000 --- a/engine/source/platformOSX/osxNetwork.mm +++ /dev/null @@ -1,895 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- -#import "platformOSX/platformOSX.h" -#include "platform/platform.h" -#include "platform/event.h" -#include "platform/platformNetAsync.unix.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -// Header clean-up by William Taysom -#include - -// IPX fixes from William Taysom. -#define IPX_NODE_LEN 6 - -// for 10.2 compatability... -#ifndef socklen_t -#define socklen_t unsigned int -#endif - -struct sockaddr_ipx -{ - sa_family_t sipx_family; - U16 sipx_port; - U32 sipx_network; - unsigned char sipx_node[IPX_NODE_LEN]; - U8 sipx_type; - unsigned char sipx_zero; /* 16 byte fill */ -}; -// end wtaysom changes (May 26, 2004) - -#include - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" -#include "collection/vector.h" - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static int ipxSocket = InvalidSocket; -static int udpSocket = InvalidSocket; - -// local enum for socket states for polled sockets -enum SocketState -{ - InvalidState, - Connected, - ConnectionPending, - Listening, - NameLookupRequired -}; - -// the Socket structure helps us keep track of the -// above states -struct Socket -{ - Socket() - { - fd = InvalidSocket; - state = InvalidState; - remoteAddr[0] = 0; - remotePort = -1; - } - - NetSocket fd; - S32 state; - char remoteAddr[256]; - S32 remotePort; -}; - -// list of polled sockets -static Vector gPolledSockets; - -static Socket* addPolledSocket(NetSocket& fd, S32 state, - char* remoteAddr = NULL, S32 port = -1) -{ - Socket* sock = new Socket(); - sock->fd = fd; - sock->state = state; - if (remoteAddr) - dStrcpy(sock->remoteAddr, remoteAddr); - if (port != -1) - sock->remotePort = port; - gPolledSockets.push_back(sock); - return sock; -} - -enum { - MaxConnections = 1024, -}; - - -bool netSocketWaitForWritable(NetSocket fd, S32 timeoutMs) -{ - fd_set writefds; - timeval timeout; - - FD_ZERO(&writefds); - FD_SET( fd, &writefds ); - - timeout.tv_sec = timeoutMs / 1000; - timeout.tv_usec = ( timeoutMs % 1000 ) * 1000; - - if( select(fd + 1, NULL, &writefds, NULL, &timeout) > 0 ) - return true; - - return false; -} - -bool Net::init() -{ - Con::printSeparator(); - Con::printf("Network initialization:"); - NetAsync::startAsync(); - Con::printSeparator(); - - return(true); -} - -void Net::shutdown() -{ - while (gPolledSockets.size() > 0) - closeConnectTo(gPolledSockets[0]->fd); - - closePort(); - NetAsync::stopAsync(); -} - -static void netToIPSocketAddress(const NetAddress *address, struct sockaddr_in *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(struct sockaddr_in)); - sockAddr->sin_family = AF_INET; - sockAddr->sin_port = htons(address->port); - char tAddr[20]; - dSprintf(tAddr, 20, "%d.%d.%d.%d\n", address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3]); - //fprintf(stdout,"netToIPSocketAddress(): %s\n",tAddr);fflush(NULL); - sockAddr->sin_addr.s_addr = inet_addr(tAddr); -} - -static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) -{ - address->type = NetAddress::IPAddress; - address->port = htons(sockAddr->sin_port); - char *tAddr; - tAddr = inet_ntoa(sockAddr->sin_addr); - //fprintf(stdout,"IPSocketToNetAddress(): %s\n",tAddr);fflush(NULL); - U8 nets[4]; - nets[0] = atoi(strtok(tAddr, ".")); - nets[1] = atoi(strtok(NULL, ".")); - nets[2] = atoi(strtok(NULL, ".")); - nets[3] = atoi(strtok(NULL, ".")); - //fprintf(stdout,"0 = %d, 1 = %d, 2 = %d, 3 = %d\n", nets[0], nets[1], nets[2], nets[3]); - address->netNum[0] = nets[0]; - address->netNum[1] = nets[1]; - address->netNum[2] = nets[2]; - address->netNum[3] = nets[3]; -} - -static void netToIPXSocketAddress(const NetAddress *address, sockaddr_ipx *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(sockaddr_ipx)); - sockAddr->sipx_family = AF_INET; - sockAddr->sipx_port = htons(address->port); - sockAddr->sipx_network = address->netNum[0]; - sockAddr->sipx_node[0] = address->nodeNum[0]; - sockAddr->sipx_node[1] = address->nodeNum[1]; - sockAddr->sipx_node[2] = address->nodeNum[2]; - sockAddr->sipx_node[3] = address->nodeNum[3]; - sockAddr->sipx_node[4] = address->nodeNum[4]; - sockAddr->sipx_node[5] = address->nodeNum[5]; -} - -NetSocket Net::openListenPort(U16 port) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - - NetSocket sock = openSocket(); - if (sock == InvalidSocket) - { - Con::errorf("Unable to open listen socket: %s", strerror(errno)); - return InvalidSocket; - } - - if (bind(sock, port) != NoError) - { - Con::errorf("Unable to bind port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - if (listen(sock, 4) != NoError) - { - Con::errorf("Unable to listen on port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - - setBlocking(sock, false); - addPolledSocket(sock, Listening); - -#ifdef TORQUE_ALLOW_JOURNALING - if (Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - - return sock; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - if(!dStrnicmp(addressString, "ipx:", 4)) - return InvalidSocket; - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - char remoteAddr[256]; - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - - U16 port; - if(portString) - { - *portString++ = 0; - port = htons(dAtoi(portString)); - } - else - port = htons(defaultPort); - - if(!dStricmp(remoteAddr, "broadcast")) - return InvalidSocket; - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - - NetSocket sock = openSocket(); - setBlocking(sock, false); - - sockaddr_in ipAddr; - dMemset(&ipAddr, 0, sizeof(ipAddr)); - - if (inet_aton(remoteAddr, &ipAddr.sin_addr) != 0) - { - ipAddr.sin_port = port; - ipAddr.sin_family = AF_INET; - if(::connect(sock, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1 && - errno != EINPROGRESS) - { - Con::errorf("Error connecting %s: %s", - addressString, strerror(errno)); - ::close(sock); - sock = InvalidSocket; - } - if(sock != InvalidSocket) { - // add this socket to our list of polled sockets - addPolledSocket(sock, ConnectionPending); - } - } - else - { - // need to do an asynchronous name lookup. first, add the socket - // to the polled list - addPolledSocket(sock, NameLookupRequired, remoteAddr, port); - // queue the lookup - gNetAsync.queueLookup(remoteAddr, sock); - } -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - - return sock; -} - -void Net::closeConnectTo(NetSocket sock) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return; -#endif //TORQUE_ALLOW_JOURNALING - - // if this socket is in the list of polled sockets, remove it - for (int i = 0; i < gPolledSockets.size(); ++i) - if (gPolledSockets[i]->fd == sock) - { - delete gPolledSockets[i]; - gPolledSockets.erase(i); - break; - } - - closeSocket(sock); -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 e; - Game->journalRead(&e); - - return (Net::Error) e; - } -#endif //TORQUE_ALLOW_JOURNALING - - Net::Error e = send(socket, buffer, bufferSize); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(e)); -#endif //TORQUE_ALLOW_JOURNALING - - return e; -} - -bool Net::openPort(S32 port) -{ - if(udpSocket != InvalidSocket) - close(udpSocket); - if(ipxSocket != InvalidSocket) - close(ipxSocket); - - udpSocket = socket(AF_INET, SOCK_DGRAM, 0); - ipxSocket = socket(AF_IPX, SOCK_DGRAM, 0); - - if(udpSocket != InvalidSocket) - { - Net::Error error; - error = bind(udpSocket, port); - if(error == NoError) - error = setBufferSize(udpSocket, 32768); - if(error == NoError) - error = setBroadcast(udpSocket, true); - if(error == NoError) - error = setBlocking(udpSocket, false); - if(error == NoError) - Con::printf("UDP initialized on port %d", port); - else - { - close(udpSocket); - udpSocket = InvalidSocket; - Con::printf("Unable to initialize UDP - error %d", error); - } - } - if(ipxSocket != InvalidSocket) - { - Net::Error error = NoError; - sockaddr_ipx ipxAddress; - memset((char *)&ipxAddress, 0, sizeof(ipxAddress)); - ipxAddress.sipx_family = AF_IPX; - ipxAddress.sipx_port = htons(port); - S32 err = ::bind(ipxSocket, (struct sockaddr *)&ipxAddress, sizeof(ipxAddress)); - if(err) - error = getLastError(); - if(error == NoError) - error = setBufferSize(ipxSocket, 32768); - if(error == NoError) - error = setBroadcast(ipxSocket, true); - if(error == NoError) - error = setBlocking(ipxSocket, false); - if(error == NoError) - Con::printf("IPX initialized on port %d", port); - else - { - close(ipxSocket); - ipxSocket = InvalidSocket; - Con::printf("Unable to initialize IPX - error %d", error); - } - } - netPort = port; - return ipxSocket != InvalidSocket || udpSocket != InvalidSocket; -} - -void Net::closePort() -{ - if(ipxSocket != InvalidSocket) - close(ipxSocket); - if(udpSocket != InvalidSocket) - close(udpSocket); -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return NoError; -#endif //TORQUE_ALLOW_JOURNALING - - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - if(::sendto(udpSocket, (const char*)buffer, bufferSize, 0, - (sockaddr *) &ipAddr, sizeof(sockaddr_in)) == -1) - return getLastError(); - else - return NoError; - } - - // Reached the end of the function unexpectedly - return UnknownError; -} - -void Net::process() -{ - sockaddr sa; - - PacketReceiveEvent receiveEvent; - for(;;) - { - U32 addrLen = sizeof(sa); - S32 bytesRead = -1; - if(udpSocket != InvalidSocket) - bytesRead = (S32)recvfrom(udpSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - if(bytesRead == -1 && ipxSocket != InvalidSocket) - { - addrLen = sizeof(sa); - bytesRead = (S32)recvfrom(ipxSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - } - - if(bytesRead == -1) - break; - - if(sa.sa_family == AF_INET) - IPSocketToNetAddress((sockaddr_in *) &sa, &receiveEvent.sourceAddress); - else - continue; - - NetAddress &na = receiveEvent.sourceAddress; - if(na.type == NetAddress::IPAddress && - na.netNum[0] == 127 && - na.netNum[1] == 0 && - na.netNum[2] == 0 && - na.netNum[3] == 1 && - na.port == netPort) - continue; - if(bytesRead <= 0) - continue; - receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - - // process the polled sockets. This blob of code performs functions - // similar to WinsockProc in winNet.cc - - if (gPolledSockets.size() == 0) - return; - - static ConnectedNotifyEvent notifyEvent; - static ConnectedAcceptEvent acceptEvent; - static ConnectedReceiveEvent cReceiveEvent; - - S32 optval; - socklen_t optlen = sizeof(S32); - S32 bytesRead; - Net::Error err; - bool removeSock = false; - Socket *currentSock = NULL; - sockaddr_in ipAddr; - NetSocket incoming = InvalidSocket; - char out_h_addr[1024]; - int out_h_length = 0; - - for (S32 i = 0; i < gPolledSockets.size(); - /* no increment, this is done at end of loop body */) - { - removeSock = false; - currentSock = gPolledSockets[i]; - switch (currentSock->state) - { - case InvalidState: - Con::errorf("Error, InvalidState socket in polled sockets list"); - break; - case ConnectionPending: - notifyEvent.tag = currentSock->fd; - // see if it is now connected - if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR, - &optval, &optlen) == -1) - { - Con::errorf("Error getting socket options: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - else - { - if (optval == EINPROGRESS) - // still connecting... - break; - - if (optval == 0) - { - // poll for writable status to be sure we're connected. - bool ready = netSocketWaitForWritable(currentSock->fd,0); - if(!ready) - break; - - // connected. - notifyEvent.state = ConnectedNotifyEvent::Connected; - Game->postEvent(notifyEvent); - currentSock->state = Connected; - } - else - { - // some kind of error - Con::errorf("Error connecting: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - break; - case Connected: - bytesRead = 0; - // try to get some data - err = Net::recv(currentSock->fd, cReceiveEvent.data, MaxPacketDataSize, &bytesRead); - if(err == Net::NoError) - { - if (bytesRead > 0) - { - // got some data, post it - cReceiveEvent.tag = currentSock->fd; - cReceiveEvent.size = ConnectedReceiveEventHeaderSize + - bytesRead; - Game->postEvent(cReceiveEvent); - } - else - { - // zero bytes read means EOF - if (bytesRead < 0) - // ack! this shouldn't happen - Con::errorf("Unexpected error on socket: %s", - strerror(errno)); - - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - else if (err != Net::NoError && err != Net::WouldBlock) - { - Con::errorf("Error reading from socket: %s", strerror(errno)); - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - break; - case NameLookupRequired: - // is the lookup complete? - if (!gNetAsync.checkLookup( - currentSock->fd, out_h_addr, &out_h_length, - sizeof(out_h_addr))) - break; - - notifyEvent.tag = currentSock->fd; - if (out_h_length == -1) - { - Con::errorf("DNS lookup failed: %s", currentSock->remoteAddr); - notifyEvent.state = ConnectedNotifyEvent::DNSFailed; - removeSock = true; - } - else - { - // try to connect - dMemcpy(&(ipAddr.sin_addr.s_addr), out_h_addr, out_h_length); - ipAddr.sin_port = currentSock->remotePort; - ipAddr.sin_family = AF_INET; - if(::connect(currentSock->fd, (struct sockaddr *)&ipAddr, - sizeof(ipAddr)) == -1) - { - if (errno == EINPROGRESS) - { - notifyEvent.state = ConnectedNotifyEvent::DNSResolved; - currentSock->state = ConnectionPending; - } - else - { - Con::errorf("Error connecting to %s: %s", - currentSock->remoteAddr, strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - removeSock = true; - } - } - else - { - notifyEvent.state = ConnectedNotifyEvent::Connected; - currentSock->state = Connected; - } - } - Game->postEvent(notifyEvent); - break; - case Listening: - incoming = - Net::accept(currentSock->fd, &acceptEvent.address); - if(incoming != InvalidSocket) - { - acceptEvent.portTag = currentSock->fd; - acceptEvent.connectionTag = incoming; - setBlocking(incoming, false); - addPolledSocket(incoming, Connected); - Game->postEvent(acceptEvent); - } - break; - } - - // only increment index if we're not removing the connection, since - // the removal will shift the indices down by one - if (removeSock) - closeConnectTo(currentSock->fd); - else - i++; - } -} - -NetSocket Net::openSocket() -{ - int retSocket; - retSocket = socket(AF_INET, SOCK_STREAM, 0); - - if(retSocket == InvalidSocket) - return InvalidSocket; - else - return retSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - if(socket != InvalidSocket) - { - // if we're quitting, allow the OS to close the sockets. - // this is here to work around a bug in close(). - osxPlatState * platState = [osxPlatState sharedPlatState]; - - if(platState.quit) - return NoError; - - if(!close(socket)) - return NoError; - else - return getLastError(); - } - else - return NotASocket; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - if(address->type != NetAddress::IPAddress) - return WrongProtocolType; - sockaddr_in socketAddress; - netToIPSocketAddress(address, &socketAddress); - if(!::connect(socket, (sockaddr *) &socketAddress, sizeof(socketAddress))) - return NoError; - return getLastError(); -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - if(!::listen(socket, backlog)) - return NoError; - return getLastError(); -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - sockaddr_in socketAddress; - U32 addrLen = sizeof(socketAddress); - - int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen); - if(retVal != InvalidSocket) - { - IPSocketToNetAddress(&socketAddress, remoteAddress); - return retVal; - } - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - S32 error; - - sockaddr_in socketAddress; - dMemset((char *)&socketAddress, 0, sizeof(socketAddress)); - socketAddress.sin_family = AF_INET; - // It's entirely possible that there are two NIC cards. - // We let the user specify which one the server runs on. - - // thanks to [TPG]P1aGu3 for the name - const char* serverIP = Con::getVariable( "Pref::Net::BindAddress" ); - // serverIP is guaranteed to be non-0. - AssertFatal( serverIP, "serverIP is NULL!" ); - - if( serverIP[0] != '\0' ) { - // we're not empty - socketAddress.sin_addr.s_addr = inet_addr( serverIP ); - - if( socketAddress.sin_addr.s_addr != INADDR_NONE ) { - Con::printf( "Binding server port to %s", serverIP ); - } else { - Con::warnf( ConsoleLogEntry::General, - "inet_addr() failed for %s while binding!", - serverIP ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - } else { - Con::printf( "Binding server port to default IP" ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - socketAddress.sin_port = htons(port); - error = ::bind(socket, (sockaddr *) &socketAddress, sizeof(socketAddress)); - - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - S32 error; - error = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - error = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - S32 bc = broadcast; - S32 error = setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - int notblock = !blockingIO; - S32 error = ioctl(socket, FIONBIO, ¬block); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - errno = 0; - S32 bytesWritten = (S32)::send(socket, (const char*)buffer, bufferSize, 0); - if(bytesWritten == -1) - Con::errorf("Could not write to socket. Error: %s",strerror(errno)); - - return getLastError(); -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - *bytesRead = (S32)::recv(socket, (char*)buffer, bufferSize, 0); - if(*bytesRead == -1) - return getLastError(); - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - // assume IP if it doesn't have ipx: at the front. - - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - - sockaddr_in ipAddr; - char remoteAddr[256]; - if(strlen(addressString) > 255) - return false; - - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - if(portString) - *portString++ = '\0'; - - struct hostent *hp; - if(!dStricmp(remoteAddr, "broadcast")) - ipAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); - else - { - if (inet_aton(remoteAddr,&ipAddr.sin_addr) == 0) // error - { - if((hp = gethostbyname(remoteAddr)) == 0) - return false; - else - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(in_addr)); - } - } - if(portString) - ipAddr.sin_port = htons(dAtoi(portString)); - else - ipAddr.sin_port = htons(defaultPort); - ipAddr.sin_family = AF_INET; - IPSocketToNetAddress(&ipAddr, address); - return true; -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - - if(ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST)) - dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); - else - dSprintf(addressString, 256, "IP:%s:%d", inet_ntoa(ipAddr.sin_addr), - ntohs(ipAddr.sin_port)); - // dSprintf(addressString, 256, "IP:%d:%d", ipAddr.sin_addr.s_addr, - // ntohs(ipAddr.sin_port)); - } - else - { - return; - dSprintf(addressString, 256, "IPX:%.2X%.2X%.2X%.2X:%.2X%.2X%.2X%.2X%.2X%.2X:%d", - address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3], - address->nodeNum[0], address->nodeNum[1], address->nodeNum[2], address->nodeNum[3], address->nodeNum[4], address->nodeNum[5], - address->port); - } -} - -Net::Error getLastError() -{ - if (errno == EAGAIN) - return Net::WouldBlock; - if (errno == 0) - return Net::NoError; - - return Net::UnknownError; -} \ No newline at end of file diff --git a/engine/source/platformOSX/osxString.mm b/engine/source/platformOSX/osxString.mm index fadee7093..bf7c98230 100755 --- a/engine/source/platformOSX/osxString.mm +++ b/engine/source/platformOSX/osxString.mm @@ -319,14 +319,14 @@ U32 dStrcspn(const char *str, const char *set) //----------------------------------------------------------------------------- -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1, str2); } //----------------------------------------------------------------------------- -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr(str1, str2); } diff --git a/engine/source/platformWin32/winNet.cc b/engine/source/platformWin32/winNet.cc deleted file mode 100755 index aa3eafe2d..000000000 --- a/engine/source/platformWin32/winNet.cc +++ /dev/null @@ -1,867 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - - -#include "platformWin32/platformWin32.h" -#include "platform/platform.h" -#include "platform/event.h" -#include - -#if !defined(USE_IPX) || defined(TORQUE_COMPILER_MINGW) -# define NO_IPX_SUPPORT -#endif - -#if !defined(NO_IPX_SUPPORT) -# include -#else - typedef void* SOCKADDR_IPX; -#endif - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" - -struct NameLookup -{ - U8 hostEntStruct[MAXGETHOSTSTRUCT]; - HANDLE lookupHandle; - SOCKET socket; - U16 port; - NameLookup *nextLookup; -}; - -static NameLookup *lookupList = NULL; - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static SOCKET ipxSocket = INVALID_SOCKET; -static SOCKET udpSocket = INVALID_SOCKET; - -enum WinNetConstants { - MaxConnections = 1024, ///< Maximum allowed number of connections. -}; - -HWND winsockWindow = NULL; - -static LRESULT PASCAL WinsockProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - U32 error; - U32 bufLen; - U32 event; - SOCKET socket; - Net::Error err; - S32 bytesRead; - - static ConnectedNotifyEvent notifyEvent; - static ConnectedReceiveEvent receiveEvent; - static ConnectedAcceptEvent acceptEvent; - - switch(message) - { - case WM_USER: - error = WSAGETSELECTERROR(lParam); - event = WSAGETSELECTEVENT(lParam); - socket = wParam; - switch(event) - { - case FD_READ: - err = Net::recv(socket, receiveEvent.data, MaxPacketDataSize, &bytesRead); - if(err == Net::NoError && bytesRead != 0) - { - receiveEvent.tag = socket; - receiveEvent.size = ConnectedReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - break; - case FD_CONNECT: - notifyEvent.tag = socket; - if(error) - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - else - notifyEvent.state = ConnectedNotifyEvent::Connected; - Game->postEvent(notifyEvent); - break; - case FD_CLOSE: - // see first if there is anything to read: - for(;;) - { - err = Net::recv(socket, receiveEvent.data, MaxPacketDataSize, &bytesRead); - if(err != Net::NoError || bytesRead == 0) - break; - - receiveEvent.tag = socket; - receiveEvent.size = ConnectedReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - notifyEvent.tag = socket; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - break; - case FD_ACCEPT: - acceptEvent.portTag = socket; - acceptEvent.connectionTag = Net::accept(socket, &acceptEvent.address); - if(acceptEvent.connectionTag != InvalidSocket) - { - Net::setBlocking(acceptEvent.connectionTag, false); - WSAAsyncSelect(acceptEvent.connectionTag, winsockWindow, WM_USER, FD_READ | FD_CONNECT | FD_CLOSE); - Game->postEvent(acceptEvent); - } - break; - } - break; - case WM_USER + 1: - error = WSAGETASYNCERROR(lParam); - bufLen = WSAGETASYNCBUFLEN(lParam); - HANDLE handle; - handle = HANDLE(wParam); - NameLookup **walk; - for(walk = &lookupList; *walk; walk = &((*walk)->nextLookup)) - { - if((*walk)->lookupHandle == handle) - { - NameLookup *temp = *walk; - struct hostent *hp = (struct hostent *) temp->hostEntStruct; - - if(error) - { - notifyEvent.state = ConnectedNotifyEvent::DNSFailed; - notifyEvent.tag = temp->socket; - ::closesocket(temp->socket); - } - else - { - SOCKADDR_IN ipAddr; - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(IN_ADDR)); - ipAddr.sin_port = temp->port; - ipAddr.sin_family = AF_INET; - - notifyEvent.tag = temp->socket; - - WSAAsyncSelect(temp->socket, winsockWindow, WM_USER, FD_READ | FD_CONNECT | FD_CLOSE); - bool wserr = ::connect(temp->socket, (PSOCKADDR) &ipAddr, sizeof(ipAddr)); // always errors out - if (wserr && WSAGetLastError() == WSAEWOULDBLOCK) - notifyEvent.state = ConnectedNotifyEvent::DNSResolved; - else { - Con::printf("Connect error: %d", WSAGetLastError()); - ::closesocket(temp->socket); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - } - } - Game->postEvent(notifyEvent); - - *walk = temp->nextLookup; - delete temp; - break; - } - } - break; - default: - return DefWindowProc( hWnd, message, wParam, lParam ); - } - return 0; -} - - -static void InitNetWindow() -{ - WNDCLASS wc; - dMemset(&wc, 0, sizeof(wc)); - - wc.style = 0; - wc.lpfnWndProc = WinsockProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = winState.appInstance; - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = 0; - wc.lpszClassName = dT("WinSockClass"); - RegisterClass( &wc ); - winsockWindow = CreateWindowEx( - 0, - dT("WinSockClass"), - dT(""), - 0, - 0, 0, 0, 0, - NULL, NULL, - winState.appInstance, - NULL); -} - -bool Net::init() -{ - WSADATA stWSAData; - InitNetWindow(); - return !WSAStartup(0x0101, &stWSAData); -} - -void Net::shutdown() -{ - while(lookupList) - { - NameLookup *temp = lookupList; - lookupList = temp->nextLookup; - WSACancelAsyncRequest ( temp->lookupHandle ); - delete temp; - } - DestroyWindow(winsockWindow); - closePort(); - WSACleanup(); -} - -static void netToIPSocketAddress(const NetAddress *address, SOCKADDR_IN *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(SOCKADDR_IN)); - sockAddr->sin_family = AF_INET; - sockAddr->sin_port = htons(address->port); - sockAddr->sin_addr.s_net = address->netNum[0]; - sockAddr->sin_addr.s_host = address->netNum[1]; - sockAddr->sin_addr.s_lh = address->netNum[2]; - sockAddr->sin_addr.s_impno = address->netNum[3]; -} - -static void IPSocketToNetAddress(const SOCKADDR_IN *sockAddr, NetAddress *address) -{ - address->type = NetAddress::IPAddress; - address->port = htons(sockAddr->sin_port); - address->netNum[0] = sockAddr->sin_addr.s_net; - address->netNum[1] = sockAddr->sin_addr.s_host; - address->netNum[2] = sockAddr->sin_addr.s_lh; - address->netNum[3] = sockAddr->sin_addr.s_impno; -} - -static void netToIPXSocketAddress(const NetAddress *address, SOCKADDR_IPX *sockAddr) -{ -#if !defined(NO_IPX_SUPPORT) - dMemset(sockAddr, 0, sizeof(SOCKADDR_IPX)); - sockAddr->sa_family = AF_INET; - sockAddr->sa_socket = htons(address->port); - sockAddr->sa_netnum[0] = address->netNum[0]; - sockAddr->sa_netnum[1] = address->netNum[1]; - sockAddr->sa_netnum[2] = address->netNum[2]; - sockAddr->sa_netnum[3] = address->netNum[3]; - sockAddr->sa_nodenum[0] = address->nodeNum[0]; - sockAddr->sa_nodenum[1] = address->nodeNum[1]; - sockAddr->sa_nodenum[2] = address->nodeNum[2]; - sockAddr->sa_nodenum[3] = address->nodeNum[3]; - sockAddr->sa_nodenum[4] = address->nodeNum[4]; - sockAddr->sa_nodenum[5] = address->nodeNum[5]; -#endif -} - -static void IPXSocketToNetAddress(const SOCKADDR_IPX *sockAddr, NetAddress *address) -{ -#if !defined(NO_IPX_SUPPORT) - address->type = NetAddress::IPXAddress; - address->port = htons(sockAddr->sa_socket); - address->netNum[0] = sockAddr->sa_netnum[0] ; - address->netNum[1] = sockAddr->sa_netnum[1] ; - address->netNum[2] = sockAddr->sa_netnum[2] ; - address->netNum[3] = sockAddr->sa_netnum[3] ; - address->nodeNum[0] = sockAddr->sa_nodenum[0]; - address->nodeNum[1] = sockAddr->sa_nodenum[1]; - address->nodeNum[2] = sockAddr->sa_nodenum[2]; - address->nodeNum[3] = sockAddr->sa_nodenum[3]; - address->nodeNum[4] = sockAddr->sa_nodenum[4]; - address->nodeNum[5] = sockAddr->sa_nodenum[5]; -#endif -} - -NetSocket Net::openListenPort(U16 port) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - - NetSocket sock = openSocket(); - bind(sock, port); - listen(sock, 4); - setBlocking(sock, false); - if(WSAAsyncSelect ( sock, winsockWindow, WM_USER, FD_ACCEPT )) - Con::printf("Connect error: %d", WSAGetLastError()); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - - return sock; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - if(!dStrnicmp(addressString, "ipx:", 4)) - return InvalidSocket; - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - char remoteAddr[256]; - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - - U16 port; - if(portString) - { - *portString++ = 0; - port = htons(dAtoi(portString)); - } - else - port = htons(defaultPort); - - if(!dStricmp(remoteAddr, "broadcast")) - return InvalidSocket; - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - - NetSocket sock = openSocket(); - setBlocking(sock, false); - - SOCKADDR_IN ipAddr; - - ipAddr.sin_addr.s_addr = inet_addr(remoteAddr); - - if(ipAddr.sin_addr.s_addr != INADDR_NONE) - { - ipAddr.sin_port = port; - ipAddr.sin_family = AF_INET; - WSAAsyncSelect(sock, winsockWindow, WM_USER, FD_READ | FD_CONNECT | FD_CLOSE); - if(::connect(sock, (PSOCKADDR) &ipAddr, sizeof(ipAddr) ) ) - { - if(WSAGetLastError() != WSAEWOULDBLOCK) - { - Con::printf("Connect error: %d", WSAGetLastError()); - ::closesocket(sock); - sock = InvalidSocket; - } - } - } - else - { - NameLookup *lookup = new NameLookup; - lookup->socket = sock; - lookup->port = port; - lookup->lookupHandle = WSAAsyncGetHostByName (winsockWindow, WM_USER + 1, remoteAddr, (char *) lookup->hostEntStruct, MAXGETHOSTSTRUCT ); - if(!lookup->lookupHandle) - { - delete lookup; - ::closesocket(sock); - sock = InvalidSocket; - } - else - { - lookup->nextLookup = lookupList; - lookupList = lookup; - } - } - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - - return sock; -} - -void Net::closeConnectTo(NetSocket sock) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return; -#endif //TORQUE_ALLOW_JOURNALING - - for(NameLookup **walk = &lookupList; *walk; walk = &((*walk)->nextLookup) ) - { - NameLookup *lookup = *walk; - if(lookup->socket == sock) - { - WSACancelAsyncRequest ( lookup->lookupHandle ); - closesocket(lookup->socket); - *walk = lookup->nextLookup; - delete lookup; - return; - } - } - closesocket(sock); -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 e; - Game->journalRead(&e); - - return (Net::Error) e; - } -#endif //TORQUE_ALLOW_JOURNALING - - Net::Error e = send(socket, buffer, bufferSize); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(e)); -#endif //TORQUE_ALLOW_JOURNALING - return e; -} - -bool Net::openPort(S32 port) -{ - if(udpSocket != INVALID_SOCKET) - closesocket(udpSocket); - if(ipxSocket != INVALID_SOCKET) - closesocket(ipxSocket); - - udpSocket = socket(AF_INET, SOCK_DGRAM, 0); - -#if !defined(NO_IPX_SUPPORT) - ipxSocket = socket(AF_IPX, SOCK_DGRAM, NSPROTO_IPX); -#else - ipxSocket = INVALID_SOCKET; -#endif - - if(udpSocket != INVALID_SOCKET) - { - Net::Error error; - error = bind(udpSocket, port); - if(error == NoError) - error = setBufferSize(udpSocket, 32768); - if(error == NoError) - error = setBroadcast(udpSocket, true); - if(error == NoError) - error = setBlocking(udpSocket, false); - if(error == NoError) - Con::printf("UDP initialized on port %d", port); - else - { - closesocket(udpSocket); - udpSocket = INVALID_SOCKET; - Con::printf("Unable to initialize UDP - error %d", error); - } - } - -#if !defined(NO_IPX_SUPPORT) - if(ipxSocket != INVALID_SOCKET) - { - Net::Error error = NoError; - SOCKADDR_IPX ipxAddress; - memset((char *)&ipxAddress, 0, sizeof(ipxAddress)); - ipxAddress.sa_family = AF_IPX; - ipxAddress.sa_socket = htons(port); - S32 err = ::bind(ipxSocket, (PSOCKADDR) &ipxAddress, sizeof(ipxAddress)); - if(err) - error = getLastError(); - if(error == NoError) - error = setBufferSize(ipxSocket, 32768); - if(error == NoError) - error = setBroadcast(ipxSocket, true); - if(error == NoError) - error = setBlocking(ipxSocket, false); - if(error == NoError) - Con::printf("IPX initialized on port %d", port); - else - { - closesocket(ipxSocket); - ipxSocket = INVALID_SOCKET; - Con::printf("Unable to initialize IPX - error %d", error); - } - } -#endif - netPort = port; - return ipxSocket != INVALID_SOCKET || udpSocket != INVALID_SOCKET; -} - -void Net::closePort() -{ - if(ipxSocket != INVALID_SOCKET) - closesocket(ipxSocket); - if(udpSocket != INVALID_SOCKET) - closesocket(udpSocket); -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return NoError; -#endif //TORQUE_ALLOW_JOURNALING - - if(address->type == NetAddress::IPXAddress) - { - SOCKADDR_IPX ipxAddr; - netToIPXSocketAddress(address, &ipxAddr); - if(::sendto(ipxSocket, (const char*)buffer, bufferSize, 0, - (PSOCKADDR) &ipxAddr, sizeof(SOCKADDR_IPX)) == SOCKET_ERROR) - return getLastError(); - else - return NoError; - } - else - { - SOCKADDR_IN ipAddr; - netToIPSocketAddress(address, &ipAddr); - if(::sendto(udpSocket, (const char*)buffer, bufferSize, 0, - (PSOCKADDR) &ipAddr, sizeof(SOCKADDR_IN)) == SOCKET_ERROR) - return getLastError(); - else - return NoError; - } -} - -void Net::process() -{ - SOCKADDR sa; - - PacketReceiveEvent receiveEvent; - for(;;) - { - S32 addrLen = sizeof(sa); - S32 bytesRead = SOCKET_ERROR; - if(udpSocket != INVALID_SOCKET) - bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - if(bytesRead == SOCKET_ERROR && ipxSocket != INVALID_SOCKET) - { - addrLen = sizeof(sa); - bytesRead = recvfrom(ipxSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - } - - if(bytesRead == SOCKET_ERROR) - break; - - if(sa.sa_family == AF_INET) - IPSocketToNetAddress((SOCKADDR_IN *) &sa, &receiveEvent.sourceAddress); - else if(sa.sa_family == AF_IPX) - IPXSocketToNetAddress((SOCKADDR_IPX *) &sa, &receiveEvent.sourceAddress); - else - continue; - - NetAddress &na = receiveEvent.sourceAddress; - if(na.type == NetAddress::IPAddress && - na.netNum[0] == 127 && - na.netNum[1] == 0 && - na.netNum[2] == 0 && - na.netNum[3] == 1 && - na.port == netPort) - continue; - if(bytesRead <= 0) - continue; - receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } -} - -NetSocket Net::openSocket() -{ - SOCKET retSocket; - retSocket = socket(AF_INET, SOCK_STREAM, 0); - - if(retSocket == INVALID_SOCKET) - return InvalidSocket; - else - return retSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - if(socket != InvalidSocket) - { - if(!closesocket(socket)) - return NoError; - else - return getLastError(); - } - else - return NotASocket; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - if(address->type != NetAddress::IPAddress) - return WrongProtocolType; - SOCKADDR_IN socketAddress; - netToIPSocketAddress(address, &socketAddress); - if(!::connect(socket, (PSOCKADDR) &socketAddress, sizeof(socketAddress))) - return NoError; - return getLastError(); -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - if(!::listen(socket, backlog)) - return NoError; - return getLastError(); -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - SOCKADDR_IN socketAddress; - S32 addrLen = sizeof(socketAddress); - - SOCKET retVal = ::accept(acceptSocket, (PSOCKADDR) &socketAddress, &addrLen); - if(retVal != INVALID_SOCKET) - { - IPSocketToNetAddress(&socketAddress, remoteAddress); - return retVal; - } - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - S32 error; - - SOCKADDR_IN socketAddress; - dMemset((char *)&socketAddress, 0, sizeof(socketAddress)); - socketAddress.sin_family = AF_INET; - // It's entirely possible that there are two NIC cards. - // We let the user specify which one the server runs on. - - // thanks to [TPG]P1aGu3 for the name - const char* serverIP = Con::getVariable( "Pref::Net::BindAddress" ); - // serverIP is guaranteed to be non-0. - AssertFatal( serverIP, "serverIP is NULL!" ); - - if( serverIP[0] != '\0' ) { - // we're not empty - socketAddress.sin_addr.s_addr = inet_addr( serverIP ); - - if( socketAddress.sin_addr.s_addr != INADDR_NONE ) { - Con::printf( "Binding server port to %s", serverIP ); - } else { - Con::warnf( ConsoleLogEntry::General, - "inet_addr() failed for %s while binding!", - serverIP ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - } else { - Con::printf( "Binding server port to default IP" ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - socketAddress.sin_port = htons(port); - error = ::bind(socket, (PSOCKADDR) &socketAddress, sizeof(socketAddress)); - - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - S32 error; - error = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - error = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - S32 bc = broadcast; - S32 error = setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - DWORD notblock = !blockingIO; - S32 error = ioctlsocket(socket, FIONBIO, ¬block); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - S32 error = ::send(socket, (const char*)buffer, bufferSize, 0); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - *bytesRead = ::recv(socket, (char*)buffer, bufferSize, 0); - if(*bytesRead == SOCKET_ERROR) - return getLastError(); - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - if(dStrnicmp(addressString, "ipx:", 4)) - { - // assume IP if it doesn't have ipx: at the front. - - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - - SOCKADDR_IN ipAddr; - char remoteAddr[256]; - if(strlen(addressString) > 255) - return false; - - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - if(portString) - *portString++ = 0; - - struct hostent *hp; - - if(!dStricmp(remoteAddr, "broadcast")) - ipAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); - else - { - ipAddr.sin_addr.s_addr = inet_addr(remoteAddr); - if(ipAddr.sin_addr.s_addr == INADDR_NONE) - { - if((hp = gethostbyname(remoteAddr)) == NULL) - return false; - else - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(IN_ADDR)); - } - } - if(portString) - ipAddr.sin_port = htons(dAtoi(portString)); - else - ipAddr.sin_port = htons(defaultPort); - ipAddr.sin_family = AF_INET; - IPSocketToNetAddress(&ipAddr, address); - return true; - } - else - { - S32 i; - S32 port; - - address->type = NetAddress::IPXAddress; - for(i = 0; i < 6; i++) - address->nodeNum[i] = 0xFF; - - // it's an IPX string - addressString += 4; - if(!dStricmp(addressString, "broadcast")) - { - address->port = defaultPort; - return true; - } - else if(sscanf(addressString, "broadcast:%d", &port) == 1) - { - address->port = port; - return true; - } - else - { - S32 nodeNum[6]; - S32 netNum[4]; - S32 count = dSscanf(addressString, "%2x%2x%2x%2x:%2x%2x%2x%2x%2x%2x:%d", - &netNum[0], &netNum[1], &netNum[2], &netNum[3], - &nodeNum[0], &nodeNum[1], &nodeNum[2], &nodeNum[3], &nodeNum[4], &nodeNum[5], - &port); - - if(count == 10) - { - port = defaultPort; - count++; - } - if(count != 11) - return false; - - for(i = 0; i < 6; i++) - address->nodeNum[i] = nodeNum[i]; - for(i = 0; i < 4; i++) - address->netNum[i] = netNum[i]; - address->port = port; - return true; - } - } -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - if(address->type == NetAddress::IPAddress) - { - SOCKADDR_IN ipAddr; - netToIPSocketAddress(address, &ipAddr); - - if(ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST)) - dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); - else - dSprintf(addressString, 256, "IP:%d.%d.%d.%d:%d", ipAddr.sin_addr.s_net, - ipAddr.sin_addr.s_host, ipAddr.sin_addr.s_lh, - ipAddr.sin_addr.s_impno, ntohs(ipAddr.sin_port)); - } - else - { - dSprintf(addressString, 256, "IPX:%.2X%.2X%.2X%.2X:%.2X%.2X%.2X%.2X%.2X%.2X:%d", - address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3], - address->nodeNum[0], address->nodeNum[1], address->nodeNum[2], address->nodeNum[3], address->nodeNum[4], address->nodeNum[5], - address->port); - } -} - -Net::Error getLastError() -{ - S32 err = WSAGetLastError(); - switch(err) - { - case WSAEWOULDBLOCK: - return Net::WouldBlock; - default: - return Net::UnknownError; - } -} diff --git a/engine/source/platformWin32/winStrings.cc b/engine/source/platformWin32/winStrings.cc index 7e589bf20..2b04e48ee 100755 --- a/engine/source/platformWin32/winStrings.cc +++ b/engine/source/platformWin32/winStrings.cc @@ -247,12 +247,12 @@ U32 dStrcspn(const char *str, const char *set) } -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1,str2); } -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr((char *)str1,str2); } diff --git a/engine/source/platformWin32/winWindow.cc b/engine/source/platformWin32/winWindow.cc index cb07164f0..258a47654 100644 --- a/engine/source/platformWin32/winWindow.cc +++ b/engine/source/platformWin32/winWindow.cc @@ -1718,9 +1718,9 @@ bool Platform::openWebBrowser( const char* webAddress ) convertUTF16toUTF8(sWebKey,utf8WebKey,512); #ifdef UNICODE - char *p = dStrstr((const char *)utf8WebKey, "%1"); + char *p = dStrstr(utf8WebKey, "%1"); #else - char *p = dStrstr( (const char *) sWebKey , "%1"); + char *p = dStrstr(sWebKey, "%1"); #endif if (p) *p = 0; diff --git a/engine/source/platformX86UNIX/x86UNIXNet.cc b/engine/source/platformX86UNIX/x86UNIXNet.cc deleted file mode 100755 index 713e2ad59..000000000 --- a/engine/source/platformX86UNIX/x86UNIXNet.cc +++ /dev/null @@ -1,942 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platformX86UNIX/platformX86UNIX.h" -#include "platform/platform.h" -#include "platform/event.h" -#include "platform/platformNetAsync.unix.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -/* for PROTO_IPX */ -#if defined(__linux__) -#include -#include /* ioctl() */ -#include -#elif defined(__OpenBSD__) || defined(__FreeBSD__) -#include /* ioctl() */ -#include -#endif - -#include -#include - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" -#include "collection/vector.h" - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static int ipxSocket = InvalidSocket; -static int udpSocket = InvalidSocket; - -// local enum for socket states for polled sockets -enum SocketState -{ - InvalidState, - Connected, - ConnectionPending, - Listening, - NameLookupRequired -}; - -// the Socket structure helps us keep track of the -// above states -struct Socket -{ - Socket() - { - fd = InvalidSocket; - state = InvalidState; - remoteAddr[0] = 0; - remotePort = -1; - } - - NetSocket fd; - S32 state; - char remoteAddr[256]; - S32 remotePort; -}; - -// list of polled sockets -static Vector gPolledSockets; - -static Socket* addPolledSocket(NetSocket& fd, S32 state, - char* remoteAddr = NULL, S32 port = -1) -{ - Socket* sock = new Socket(); - sock->fd = fd; - sock->state = state; - if (remoteAddr) - dStrcpy(sock->remoteAddr, remoteAddr); - if (port != -1) - sock->remotePort = port; - gPolledSockets.push_back(sock); - return sock; -} - -enum { - MaxConnections = 1024, -}; - -S32 Poll(NetSocket fd, S32 eventMask, S32 timeoutMs) -{ - pollfd pfd; - S32 retVal; - pfd.fd = fd; - pfd.events = eventMask; - - retVal = poll(&pfd, 1, timeoutMs); - return retVal; - if (retVal <= 0) - return retVal; - else - return pfd.revents; -} - -bool Net::init() -{ - NetAsync::startAsync(); - return(true); -} - -void Net::shutdown() -{ - while (gPolledSockets.size() > 0) - closeConnectTo(gPolledSockets[0]->fd); - - closePort(); - NetAsync::stopAsync(); -} - -static void netToIPSocketAddress(const NetAddress *address, struct sockaddr_in *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(struct sockaddr_in)); - sockAddr->sin_family = AF_INET; - sockAddr->sin_port = htons(address->port); - char tAddr[20]; - dSprintf(tAddr, 20, "%d.%d.%d.%d\n", address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3]); -//fprintf(stdout,"netToIPSocketAddress(): %s\n",tAddr);fflush(NULL); - sockAddr->sin_addr.s_addr = inet_addr(tAddr); -// sockAddr->sin_addr.s_addr = address->netNum[0]; // hopefully this will work. -} - -static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) -{ - address->type = NetAddress::IPAddress; - address->port = htons(sockAddr->sin_port); - char *tAddr; - tAddr = inet_ntoa(sockAddr->sin_addr); -//fprintf(stdout,"IPSocketToNetAddress(): %s\n",tAddr);fflush(NULL); - U8 nets[4]; - nets[0] = atoi(strtok(tAddr, ".")); - nets[1] = atoi(strtok(NULL, ".")); - nets[2] = atoi(strtok(NULL, ".")); - nets[3] = atoi(strtok(NULL, ".")); -//fprintf(stdout,"0 = %d, 1 = %d, 2 = %d, 3 = %d\n", nets[0], nets[1], nets[2], nets[3]); - address->netNum[0] = nets[0]; - address->netNum[1] = nets[1]; - address->netNum[2] = nets[2]; - address->netNum[3] = nets[3]; -} - -static void netToIPXSocketAddress(const NetAddress *address, sockaddr_ipx *sockAddr) -{ -#if !defined(__FreeBSD__) - dMemset(sockAddr, 0, sizeof(sockaddr_ipx)); - sockAddr->sipx_family = AF_INET; - sockAddr->sipx_port = htons(address->port); - sockAddr->sipx_network = address->netNum[0]; - sockAddr->sipx_node[0] = address->nodeNum[0]; - sockAddr->sipx_node[1] = address->nodeNum[1]; - sockAddr->sipx_node[2] = address->nodeNum[2]; - sockAddr->sipx_node[3] = address->nodeNum[3]; - sockAddr->sipx_node[4] = address->nodeNum[4]; - sockAddr->sipx_node[5] = address->nodeNum[5]; -#endif -} - -static void IPXSocketToNetAddress(const sockaddr_ipx *sockAddr, NetAddress *address) -{ -#if !defined(__FreeBSD__) - address->type = NetAddress::IPXAddress; - address->port = htons(sockAddr->sipx_port); - address->netNum[0] = sockAddr->sipx_network; - address->nodeNum[0] = sockAddr->sipx_node[0]; - address->nodeNum[1] = sockAddr->sipx_node[1]; - address->nodeNum[2] = sockAddr->sipx_node[2]; - address->nodeNum[3] = sockAddr->sipx_node[3]; - address->nodeNum[4] = sockAddr->sipx_node[4]; - address->nodeNum[5] = sockAddr->sipx_node[5]; -#endif -} - -NetSocket Net::openListenPort(U16 port) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - - NetSocket sock = openSocket(); - if (sock == InvalidSocket) - { - Con::errorf("Unable to open listen socket: %s", strerror(errno)); - return InvalidSocket; - } - - if (bind(sock, port) != NoError) - { - Con::errorf("Unable to bind port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - if (listen(sock, 4) != NoError) - { - Con::errorf("Unable to listen on port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - - setBlocking(sock, false); - addPolledSocket(sock, Listening); -#ifdef TORQUE_ALLOW_JOURNALING - if (Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - if(!dStrnicmp(addressString, "ipx:", 4)) - return InvalidSocket; - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - char remoteAddr[256]; - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - - U16 port; - if(portString) - { - *portString++ = 0; - port = htons(dAtoi(portString)); - } - else - port = htons(defaultPort); - - if(!dStricmp(remoteAddr, "broadcast")) - return InvalidSocket; - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - NetSocket sock = openSocket(); - setBlocking(sock, false); - - sockaddr_in ipAddr; - dMemset(&ipAddr, 0, sizeof(ipAddr)); - - if (inet_aton(remoteAddr, &ipAddr.sin_addr) != 0) - { - ipAddr.sin_port = port; - ipAddr.sin_family = AF_INET; - if(::connect(sock, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1 && - errno != EINPROGRESS) - { - Con::errorf("Error connecting %s: %s", - addressString, strerror(errno)); - ::close(sock); - sock = InvalidSocket; - } - if(sock != InvalidSocket) { - // add this socket to our list of polled sockets - addPolledSocket(sock, ConnectionPending); - } - } - else - { - // need to do an asynchronous name lookup. first, add the socket - // to the polled list - addPolledSocket(sock, NameLookupRequired, remoteAddr, port); - // queue the lookup - gNetAsync.queueLookup(remoteAddr, sock); - } -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -void Net::closeConnectTo(NetSocket sock) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return; -#endif //TORQUE_ALLOW_JOURNALING - - // if this socket is in the list of polled sockets, remove it - for (int i = 0; i < gPolledSockets.size(); ++i) - if (gPolledSockets[i]->fd == sock) - { - delete gPolledSockets[i]; - gPolledSockets.erase(i); - break; - } - - closeSocket(sock); -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 e; - Game->journalRead(&e); - - return (Net::Error) e; - } -#endif //TORQUE_ALLOW_JOURNALING - - Net::Error e = send(socket, buffer, bufferSize); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(e)); -#endif //TORQUE_ALLOW_JOURNALING - return e; -} - -bool Net::openPort(S32 port) -{ - if(udpSocket != InvalidSocket) - close(udpSocket); - if(ipxSocket != InvalidSocket) - close(ipxSocket); - - udpSocket = socket(AF_INET, SOCK_DGRAM, 0); - ipxSocket = socket(AF_IPX, SOCK_DGRAM, 0); - - if(udpSocket != InvalidSocket) - { - Net::Error error; - error = bind(udpSocket, port); - if(error == NoError) - error = setBufferSize(udpSocket, 32768); - if(error == NoError) - error = setBroadcast(udpSocket, true); - if(error == NoError) - error = setBlocking(udpSocket, false); - if(error == NoError) - Con::printf("UDP initialized on port %d", port); - else - { - close(udpSocket); - udpSocket = InvalidSocket; - Con::printf("Unable to initialize UDP - error %d", error); - } - } - if(ipxSocket != InvalidSocket) - { - Net::Error error = NoError; - sockaddr_ipx ipxAddress; - memset((char *)&ipxAddress, 0, sizeof(ipxAddress)); - ipxAddress.sipx_family = AF_IPX; - ipxAddress.sipx_port = htons(port); - S32 err = ::bind(ipxSocket, (struct sockaddr *)&ipxAddress, sizeof(ipxAddress)); - if(err) - error = getLastError(); - if(error == NoError) - error = setBufferSize(ipxSocket, 32768); - if(error == NoError) - error = setBroadcast(ipxSocket, true); - if(error == NoError) - error = setBlocking(ipxSocket, false); - if(error == NoError) - Con::printf("IPX initialized on port %d", port); - else - { - close(ipxSocket); - ipxSocket = InvalidSocket; - Con::printf("Unable to initialize IPX - error %d", error); - } - } - netPort = port; - return ipxSocket != InvalidSocket || udpSocket != InvalidSocket; -} - -void Net::closePort() -{ - if(ipxSocket != InvalidSocket) - close(ipxSocket); - if(udpSocket != InvalidSocket) - close(udpSocket); -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return NoError; -#endif //TORQUE_ALLOW_JOURNALING - - if(address->type == NetAddress::IPXAddress) - { - sockaddr_ipx ipxAddr; - netToIPXSocketAddress(address, &ipxAddr); - if(::sendto(ipxSocket, (const char*)buffer, bufferSize, 0, - (sockaddr *) &ipxAddr, sizeof(sockaddr_ipx)) == -1) - return getLastError(); - else - return NoError; - } - else - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - if(::sendto(udpSocket, (const char*)buffer, bufferSize, 0, - (sockaddr *) &ipAddr, sizeof(sockaddr_in)) == -1) - return getLastError(); - else - return NoError; - } -} - -void Net::process() -{ - sockaddr sa; - - PacketReceiveEvent receiveEvent; - for(;;) - { - U32 addrLen = sizeof(sa); - S32 bytesRead = -1; - if(udpSocket != InvalidSocket) - bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - if(bytesRead == -1 && ipxSocket != InvalidSocket) - { - addrLen = sizeof(sa); - bytesRead = recvfrom(ipxSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - } - - if(bytesRead == -1) - break; - - if(sa.sa_family == AF_INET) - IPSocketToNetAddress((sockaddr_in *) &sa, &receiveEvent.sourceAddress); - else if(sa.sa_family == AF_IPX) - IPXSocketToNetAddress((sockaddr_ipx *) &sa, &receiveEvent.sourceAddress); - else - continue; - - NetAddress &na = receiveEvent.sourceAddress; - if(na.type == NetAddress::IPAddress && - na.netNum[0] == 127 && - na.netNum[1] == 0 && - na.netNum[2] == 0 && - na.netNum[3] == 1 && - na.port == netPort) - continue; - if(bytesRead <= 0) - continue; - receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - - // process the polled sockets. This blob of code performs functions - // similar to WinsockProc in winNet.cc - - if (gPolledSockets.size() == 0) - return; - - static ConnectedNotifyEvent notifyEvent; - static ConnectedAcceptEvent acceptEvent; - static ConnectedReceiveEvent cReceiveEvent; - - S32 optval; - socklen_t optlen = sizeof(S32); - S32 bytesRead; - Net::Error err; - bool removeSock = false; - Socket *currentSock = NULL; - sockaddr_in ipAddr; - NetSocket incoming = InvalidSocket; - char out_h_addr[1024]; - int out_h_length = 0; - - for (S32 i = 0; i < gPolledSockets.size(); - /* no increment, this is done at end of loop body */) - { - removeSock = false; - currentSock = gPolledSockets[i]; - switch (currentSock->state) - { - case InvalidState: - Con::errorf("Error, InvalidState socket in polled sockets list"); - break; - case ConnectionPending: - notifyEvent.tag = currentSock->fd; - // see if it is now connected - if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR, - &optval, &optlen) == -1) - { - Con::errorf("Error getting socket options: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - else - { - if (optval == EINPROGRESS) - // still connecting... - break; - - if (optval == 0) - { - // connected - notifyEvent.state = ConnectedNotifyEvent::Connected; - Game->postEvent(notifyEvent); - currentSock->state = Connected; - } - else - { - // some kind of error - Con::errorf("Error connecting: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - break; - case Connected: - bytesRead = 0; - // try to get some data - err = Net::recv(currentSock->fd, cReceiveEvent.data, - MaxPacketDataSize, &bytesRead); - if(err == Net::NoError) - { - if (bytesRead > 0) - { - // got some data, post it - cReceiveEvent.tag = currentSock->fd; - cReceiveEvent.size = ConnectedReceiveEventHeaderSize + - bytesRead; - Game->postEvent(cReceiveEvent); - } - else - { - // zero bytes read means EOF - if (bytesRead < 0) - // ack! this shouldn't happen - Con::errorf("Unexpected error on socket: %s", - strerror(errno)); - - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - else if (err != Net::NoError && err != Net::WouldBlock) - { - Con::errorf("Error reading from socket: %s", strerror(errno)); - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - break; - case NameLookupRequired: - // is the lookup complete? - if (!gNetAsync.checkLookup( - currentSock->fd, out_h_addr, &out_h_length, - sizeof(out_h_addr))) - break; - - notifyEvent.tag = currentSock->fd; - if (out_h_length == -1) - { - Con::errorf("DNS lookup failed: %s", currentSock->remoteAddr); - notifyEvent.state = ConnectedNotifyEvent::DNSFailed; - removeSock = true; - } - else - { - // try to connect - dMemcpy(&(ipAddr.sin_addr.s_addr), out_h_addr, out_h_length); - ipAddr.sin_port = currentSock->remotePort; - ipAddr.sin_family = AF_INET; - if(::connect(currentSock->fd, (struct sockaddr *)&ipAddr, - sizeof(ipAddr)) == -1) - { - if (errno == EINPROGRESS) - { - notifyEvent.state = ConnectedNotifyEvent::DNSResolved; - currentSock->state = ConnectionPending; - } - else - { - Con::errorf("Error connecting to %s: %s", - currentSock->remoteAddr, strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - removeSock = true; - } - } - else - { - notifyEvent.state = ConnectedNotifyEvent::Connected; - currentSock->state = Connected; - } - } - Game->postEvent(notifyEvent); - break; - case Listening: - incoming = - Net::accept(currentSock->fd, &acceptEvent.address); - if(incoming != InvalidSocket) - { - acceptEvent.portTag = currentSock->fd; - acceptEvent.connectionTag = incoming; - setBlocking(incoming, false); - addPolledSocket(incoming, Connected); - Game->postEvent(acceptEvent); - } - break; - } - - // only increment index if we're not removing the connection, since - // the removal will shift the indices down by one - if (removeSock) - closeConnectTo(currentSock->fd); - else - i++; - } -} - -NetSocket Net::openSocket() -{ - int retSocket; - retSocket = socket(AF_INET, SOCK_STREAM, 0); - - if(retSocket == InvalidSocket) - return InvalidSocket; - else - return retSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - if(socket != InvalidSocket) - { - if(!close(socket)) - return NoError; - else - return getLastError(); - } - else - return NotASocket; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - if(address->type != NetAddress::IPAddress) - return WrongProtocolType; - sockaddr_in socketAddress; - netToIPSocketAddress(address, &socketAddress); - if(!::connect(socket, (sockaddr *) &socketAddress, sizeof(socketAddress))) - return NoError; - return getLastError(); -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - if(!::listen(socket, backlog)) - return NoError; - return getLastError(); -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - sockaddr_in socketAddress; - U32 addrLen = sizeof(socketAddress); - - int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen); - if(retVal != InvalidSocket) - { - IPSocketToNetAddress(&socketAddress, remoteAddress); - return retVal; - } - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - S32 error; - - sockaddr_in socketAddress; - dMemset((char *)&socketAddress, 0, sizeof(socketAddress)); - socketAddress.sin_family = AF_INET; - // It's entirely possible that there are two NIC cards. - // We let the user specify which one the server runs on. - - // thanks to [TPG]P1aGu3 for the name - const char* serverIP = Con::getVariable( "Pref::Net::BindAddress" ); - // serverIP is guaranteed to be non-0. - AssertFatal( serverIP, "serverIP is NULL!" ); - - if( serverIP[0] != '\0' ) { - // we're not empty - socketAddress.sin_addr.s_addr = inet_addr( serverIP ); - - if( socketAddress.sin_addr.s_addr != INADDR_NONE ) { - Con::printf( "Binding server port to %s", serverIP ); - } else { - Con::warnf( ConsoleLogEntry::General, - "inet_addr() failed for %s while binding!", - serverIP ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - } else { - Con::printf( "Binding server port to default IP" ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - socketAddress.sin_port = htons(port); - error = ::bind(socket, (sockaddr *) &socketAddress, sizeof(socketAddress)); - - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - S32 error; - error = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - error = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - S32 bc = broadcast; - S32 error = setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - int notblock = !blockingIO; - S32 error = ioctl(socket, FIONBIO, ¬block); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - // Poll for write status. this blocks. should really - // do this in a separate thread or set it up so that the data can - // get queued and sent later - // JMQTODO - Poll(socket, POLLOUT, 10000); - - S32 error = ::send(socket, (const char*)buffer, bufferSize, 0); - if(error != -1) - return NoError; - - return getLastError(); -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - *bytesRead = ::recv(socket, (char*)buffer, bufferSize, 0); - if(*bytesRead == -1) - return getLastError(); - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - if(dStrnicmp(addressString, "ipx:", 4)) - { - // assume IP if it doesn't have ipx: at the front. - - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - - sockaddr_in ipAddr; - char remoteAddr[256]; - if(strlen(addressString) > 255) - return false; - - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - if(portString) - *portString++ = '\0'; - - struct hostent *hp; - if(!dStricmp(remoteAddr, "broadcast")) - ipAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); - else - { - if (inet_aton(remoteAddr,&ipAddr.sin_addr) == 0) // error - { - if((hp = gethostbyname(remoteAddr)) == 0) - return false; - else - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(in_addr)); - } - } - if(portString) - ipAddr.sin_port = htons(dAtoi(portString)); - else - ipAddr.sin_port = htons(defaultPort); - ipAddr.sin_family = AF_INET; - IPSocketToNetAddress(&ipAddr, address); - return true; - } - else - { - S32 i; - S32 port; - - address->type = NetAddress::IPXAddress; - for(i = 0; i < 6; i++) - address->nodeNum[i] = 0xFF; - - // it's an IPX string - addressString += 4; - if(!dStricmp(addressString, "broadcast")) - { - address->port = defaultPort; - return true; - } - else if(sscanf(addressString, "broadcast:%d", &port) == 1) - { - address->port = port; - return true; - } - else - { - S32 nodeNum[6]; - S32 netNum[4]; - S32 count = dSscanf(addressString, "%2x%2x%2x%2x:%2x%2x%2x%2x%2x%2x:%d", - &netNum[0], &netNum[1], &netNum[2], &netNum[3], - &nodeNum[0], &nodeNum[1], &nodeNum[2], &nodeNum[3], &nodeNum[4], &nodeNum[5], - &port); - - if(count == 10) - { - port = defaultPort; - count++; - } - if(count != 11) - return false; - - for(i = 0; i < 6; i++) - address->nodeNum[i] = nodeNum[i]; - for(i = 0; i < 4; i++) - address->netNum[i] = netNum[i]; - address->port = port; - return true; - } - } -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - - if(ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST)) - dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); - else - dSprintf(addressString, 256, "IP:%s:%d", inet_ntoa(ipAddr.sin_addr), - ntohs(ipAddr.sin_port)); -// dSprintf(addressString, 256, "IP:%d:%d", ipAddr.sin_addr.s_addr, -// ntohs(ipAddr.sin_port)); - } - else - { - return; - dSprintf(addressString, 256, "IPX:%.2X%.2X%.2X%.2X:%.2X%.2X%.2X%.2X%.2X%.2X:%d", - address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3], - address->nodeNum[0], address->nodeNum[1], address->nodeNum[2], address->nodeNum[3], address->nodeNum[4], address->nodeNum[5], - address->port); - } -} - -Net::Error getLastError() -{ - if (errno == EAGAIN) - return Net::WouldBlock; - return Net::UnknownError; -} - - diff --git a/engine/source/platformX86UNIX/x86UNIXStrings.cc b/engine/source/platformX86UNIX/x86UNIXStrings.cc index 5e496bf38..ff233fa75 100755 --- a/engine/source/platformX86UNIX/x86UNIXStrings.cc +++ b/engine/source/platformX86UNIX/x86UNIXStrings.cc @@ -295,12 +295,12 @@ U32 dStrcspn(const char *str, const char *set) } -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1,str2); } -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr((char *)str1,str2); } diff --git a/engine/source/platformiOS/T2DView.mm b/engine/source/platformiOS/T2DView.mm index 7e712a67b..aa9905e04 100755 --- a/engine/source/platformiOS/T2DView.mm +++ b/engine/source/platformiOS/T2DView.mm @@ -50,8 +50,9 @@ void ConvertToRetina(CGPoint *p) { - p->x *= 2; - p->y *= 2; + CGFloat screenScale = [[UIScreen mainScreen] scale]; + p->x *= screenScale; + p->y *= screenScale; } @implementation T2DView diff --git a/engine/source/platformiOS/T2DViewController.mm b/engine/source/platformiOS/T2DViewController.mm index c865c250d..d8e45d2d6 100755 --- a/engine/source/platformiOS/T2DViewController.mm +++ b/engine/source/platformiOS/T2DViewController.mm @@ -152,7 +152,7 @@ - (void)viewDidLoad retinaEnabled = false; - if([[UIScreen mainScreen] respondsToSelector:@selector(scale)] && [[UIScreen mainScreen] scale] == 2) + if([[UIScreen mainScreen] respondsToSelector:@selector(scale)] && [[UIScreen mainScreen] scale] > 1) retinaEnabled = true; UIApplication * application = [UIApplication sharedApplication]; diff --git a/engine/source/platformiOS/iOSFileio.mm b/engine/source/platformiOS/iOSFileio.mm index 34ab48e60..96223a97a 100755 --- a/engine/source/platformiOS/iOSFileio.mm +++ b/engine/source/platformiOS/iOSFileio.mm @@ -31,7 +31,7 @@ #include #include #include - +#include #include #include @@ -521,7 +521,7 @@ bool dFileTouch(const char *path) } const char* arg = avar("open '%s'", path); - U32 ret = system(arg); + U32 ret = nftw(arg, NULL, NULL, NULL); if(ret != 0) Con::printf(strerror(errno)); } diff --git a/engine/source/platformiOS/iOSNet.mm b/engine/source/platformiOS/iOSNet.mm deleted file mode 100755 index 893bc0d00..000000000 --- a/engine/source/platformiOS/iOSNet.mm +++ /dev/null @@ -1,884 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2013 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platformiOS/platformiOS.h" -#include "platform/platform.h" -#include "platform/event.h" -#include "platform/platformNetAsync.unix.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -// Header clean-up by William Taysom -#include - -// IPX fixes from William Taysom. -#define IPX_NODE_LEN 6 - -// for 10.2 compatability... -#ifndef socklen_t -#define socklen_t unsigned int -#endif - -struct sockaddr_ipx -{ - sa_family_t sipx_family; - U16 sipx_port; - U32 sipx_network; - unsigned char sipx_node[IPX_NODE_LEN]; - U8 sipx_type; - unsigned char sipx_zero; /* 16 byte fill */ -}; -// end wtaysom changes (May 26, 2004) - -#include - -#include "console/console.h" -#include "game/gameInterface.h" -#include "io/fileStream.h" -#include "collection/vector.h" - -static Net::Error getLastError(); -static S32 defaultPort = 28000; -static S32 netPort = 0; -static int ipxSocket = InvalidSocket; -static int udpSocket = InvalidSocket; - -// local enum for socket states for polled sockets -enum SocketState -{ - InvalidState, - Connected, - ConnectionPending, - Listening, - NameLookupRequired -}; - -// the Socket structure helps us keep track of the -// above states -struct Socket -{ - Socket() - { - fd = InvalidSocket; - state = InvalidState; - remoteAddr[0] = 0; - remotePort = -1; - } - - NetSocket fd; - S32 state; - char remoteAddr[256]; - S32 remotePort; -}; - -// list of polled sockets -static Vector gPolledSockets; - -static Socket* addPolledSocket(NetSocket& fd, S32 state, - char* remoteAddr = NULL, S32 port = -1) -{ - Socket* sock = new Socket(); - sock->fd = fd; - sock->state = state; - if (remoteAddr) - dStrcpy(sock->remoteAddr, remoteAddr); - if (port != -1) - sock->remotePort = port; - gPolledSockets.push_back(sock); - return sock; -} - -enum { - MaxConnections = 1024, -}; - - -bool netSocketWaitForWritable(NetSocket fd, S32 timeoutMs) -{ - fd_set writefds; - timeval timeout; - - FD_ZERO(&writefds); - FD_SET( fd, &writefds ); - - timeout.tv_sec = timeoutMs / 1000; - timeout.tv_usec = ( timeoutMs % 1000 ) * 1000; - - if( select(fd + 1, NULL, &writefds, NULL, &timeout) > 0 ) - return true; - - return false; -} - -bool Net::init() -{ - NetAsync::startAsync(); - return(true); -} - -void Net::shutdown() -{ - while (gPolledSockets.size() > 0) - closeConnectTo(gPolledSockets[0]->fd); - - closePort(); - NetAsync::stopAsync(); -} - -static void netToIPSocketAddress(const NetAddress *address, struct sockaddr_in *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(struct sockaddr_in)); - sockAddr->sin_family = AF_INET; - sockAddr->sin_port = htons(address->port); - char tAddr[20]; - dSprintf(tAddr, 20, "%d.%d.%d.%d\n", address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3]); -//fprintf(stdout,"netToIPSocketAddress(): %s\n",tAddr);fflush(NULL); - sockAddr->sin_addr.s_addr = inet_addr(tAddr); -} - -static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address) -{ - address->type = NetAddress::IPAddress; - address->port = htons(sockAddr->sin_port); - char *tAddr; - tAddr = inet_ntoa(sockAddr->sin_addr); -//fprintf(stdout,"IPSocketToNetAddress(): %s\n",tAddr);fflush(NULL); - U8 nets[4]; - nets[0] = atoi(strtok(tAddr, ".")); - nets[1] = atoi(strtok(NULL, ".")); - nets[2] = atoi(strtok(NULL, ".")); - nets[3] = atoi(strtok(NULL, ".")); -//fprintf(stdout,"0 = %d, 1 = %d, 2 = %d, 3 = %d\n", nets[0], nets[1], nets[2], nets[3]); - address->netNum[0] = nets[0]; - address->netNum[1] = nets[1]; - address->netNum[2] = nets[2]; - address->netNum[3] = nets[3]; -} - -static void netToIPXSocketAddress(const NetAddress *address, sockaddr_ipx *sockAddr) -{ - dMemset(sockAddr, 0, sizeof(sockaddr_ipx)); - sockAddr->sipx_family = AF_INET; - sockAddr->sipx_port = htons(address->port); - sockAddr->sipx_network = address->netNum[0]; - sockAddr->sipx_node[0] = address->nodeNum[0]; - sockAddr->sipx_node[1] = address->nodeNum[1]; - sockAddr->sipx_node[2] = address->nodeNum[2]; - sockAddr->sipx_node[3] = address->nodeNum[3]; - sockAddr->sipx_node[4] = address->nodeNum[4]; - sockAddr->sipx_node[5] = address->nodeNum[5]; -} - -NetSocket Net::openListenPort(U16 port) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - NetSocket sock = openSocket(); - if (sock == InvalidSocket) - { - Con::errorf("Unable to open listen socket: %s", strerror(errno)); - return InvalidSocket; - } - - if (bind(sock, port) != NoError) - { - Con::errorf("Unable to bind port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - if (listen(sock, 4) != NoError) - { - Con::errorf("Unable to listen on port %d: %s", port, strerror(errno)); - ::close(sock); - return InvalidSocket; - } - - setBlocking(sock, false); - addPolledSocket(sock, Listening); -#ifdef TORQUE_ALLOW_JOURNALING - if (Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -NetSocket Net::openConnectTo(const char *addressString) -{ - if(!dStrnicmp(addressString, "ipx:", 4)) - return InvalidSocket; - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - char remoteAddr[256]; - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - - U16 port; - if(portString) - { - *portString++ = 0; - port = htons(dAtoi(portString)); - } - else - port = htons(defaultPort); - - if(!dStricmp(remoteAddr, "broadcast")) - return InvalidSocket; - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 ret; - Game->journalRead(&ret); - return NetSocket(ret); - } -#endif //TORQUE_ALLOW_JOURNALING - NetSocket sock = openSocket(); - setBlocking(sock, false); - - sockaddr_in ipAddr; - dMemset(&ipAddr, 0, sizeof(ipAddr)); - - if (inet_aton(remoteAddr, &ipAddr.sin_addr) != 0) - { - ipAddr.sin_port = port; - ipAddr.sin_family = AF_INET; - if(::connect(sock, (struct sockaddr *)&ipAddr, sizeof(ipAddr)) == -1 && - errno != EINPROGRESS) - { - Con::errorf("Error connecting %s: %s", - addressString, strerror(errno)); - ::close(sock); - sock = InvalidSocket; - } - if(sock != InvalidSocket) { - // add this socket to our list of polled sockets - addPolledSocket(sock, ConnectionPending); - } - } - else - { - // need to do an asynchronous name lookup. first, add the socket - // to the polled list - addPolledSocket(sock, NameLookupRequired, remoteAddr, port); - // queue the lookup - gNetAsync.queueLookup(remoteAddr, sock); - } -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(sock)); -#endif //TORQUE_ALLOW_JOURNALING - return sock; -} - -void Net::closeConnectTo(NetSocket sock) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return; -#endif //TORQUE_ALLOW_JOURNALING - - // if this socket is in the list of polled sockets, remove it - for (int i = 0; i < gPolledSockets.size(); ++i) - if (gPolledSockets[i]->fd == sock) - { - delete gPolledSockets[i]; - gPolledSockets.erase(i); - break; - } - - closeSocket(sock); -} - -Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - { - U32 e; - Game->journalRead(&e); - - return (Net::Error) e; - } -#endif //TORQUE_ALLOW_JOURNALING - - Net::Error e = send(socket, buffer, bufferSize); - -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalWriting()) - Game->journalWrite(U32(e)); -#endif //TORQUE_ALLOW_JOURNALING - - return e; -} - -bool Net::openPort(S32 port) -{ - if(udpSocket != InvalidSocket) - close(udpSocket); - if(ipxSocket != InvalidSocket) - close(ipxSocket); - - udpSocket = socket(AF_INET, SOCK_DGRAM, 0); - ipxSocket = socket(AF_IPX, SOCK_DGRAM, 0); - - if(udpSocket != InvalidSocket) - { - Net::Error error; - error = bind(udpSocket, port); - if(error == NoError) - error = setBufferSize(udpSocket, 32768); - if(error == NoError) - error = setBroadcast(udpSocket, true); - if(error == NoError) - error = setBlocking(udpSocket, false); - if(error == NoError) - Con::printf("UDP initialized on port %d", port); - else - { - close(udpSocket); - udpSocket = InvalidSocket; - Con::printf("Unable to initialize UDP - error %d", error); - } - } - if(ipxSocket != InvalidSocket) - { - Net::Error error = NoError; - sockaddr_ipx ipxAddress; - memset((char *)&ipxAddress, 0, sizeof(ipxAddress)); - ipxAddress.sipx_family = AF_IPX; - ipxAddress.sipx_port = htons(port); - S32 err = ::bind(ipxSocket, (struct sockaddr *)&ipxAddress, sizeof(ipxAddress)); - if(err) - error = getLastError(); - if(error == NoError) - error = setBufferSize(ipxSocket, 32768); - if(error == NoError) - error = setBroadcast(ipxSocket, true); - if(error == NoError) - error = setBlocking(ipxSocket, false); - if(error == NoError) - Con::printf("IPX initialized on port %d", port); - else - { - close(ipxSocket); - ipxSocket = InvalidSocket; - Con::printf("Unable to initialize IPX - error %d", error); - } - } - netPort = port; - return ipxSocket != InvalidSocket || udpSocket != InvalidSocket; -} - -void Net::closePort() -{ - if(ipxSocket != InvalidSocket) - close(ipxSocket); - if(udpSocket != InvalidSocket) - close(udpSocket); -} - -Net::Error Net::sendto(const NetAddress *address, const U8 *buffer, S32 bufferSize) -{ -#ifdef TORQUE_ALLOW_JOURNALING - if(Game->isJournalReading()) - return NoError; -#endif //TORQUE_ALLOW_JOURNALING - - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - if(::sendto(udpSocket, (const char*)buffer, bufferSize, 0, - (sockaddr *) &ipAddr, sizeof(sockaddr_in)) == -1) - return getLastError(); - else - return NoError; - } - - return NoError; -} - -void Net::process() -{ - sockaddr sa; - - PacketReceiveEvent receiveEvent; - for(;;) - { - U32 addrLen = sizeof(sa); - S32 bytesRead = -1; - if(udpSocket != InvalidSocket) - bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - if(bytesRead == -1 && ipxSocket != InvalidSocket) - { - addrLen = sizeof(sa); - bytesRead = recvfrom(ipxSocket, (char *) receiveEvent.data, MaxPacketDataSize, 0, &sa, &addrLen); - } - - if(bytesRead == -1) - break; - - if(sa.sa_family == AF_INET) - IPSocketToNetAddress((sockaddr_in *) &sa, &receiveEvent.sourceAddress); - else - continue; - - NetAddress &na = receiveEvent.sourceAddress; - if(na.type == NetAddress::IPAddress && - na.netNum[0] == 127 && - na.netNum[1] == 0 && - na.netNum[2] == 0 && - na.netNum[3] == 1 && - na.port == netPort) - continue; - if(bytesRead <= 0) - continue; - receiveEvent.size = PacketReceiveEventHeaderSize + bytesRead; - Game->postEvent(receiveEvent); - } - - // process the polled sockets. This blob of code performs functions - // similar to WinsockProc in winNet.cc - - if (gPolledSockets.size() == 0) - return; - - static ConnectedNotifyEvent notifyEvent; - static ConnectedAcceptEvent acceptEvent; - static ConnectedReceiveEvent cReceiveEvent; - - S32 optval; - socklen_t optlen = sizeof(S32); - S32 bytesRead; - Net::Error err; - bool removeSock = false; - Socket *currentSock = NULL; - sockaddr_in ipAddr; - NetSocket incoming = InvalidSocket; - char out_h_addr[1024]; - int out_h_length = 0; - - for (S32 i = 0; i < gPolledSockets.size(); - /* no increment, this is done at end of loop body */) - { - removeSock = false; - currentSock = gPolledSockets[i]; - switch (currentSock->state) - { - case InvalidState: - Con::errorf("Error, InvalidState socket in polled sockets list"); - break; - case ConnectionPending: - notifyEvent.tag = currentSock->fd; - // see if it is now connected - if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR, - &optval, &optlen) == -1) - { - Con::errorf("Error getting socket options: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - else - { - if (optval == EINPROGRESS) - // still connecting... - break; - - if (optval == 0) - { - // poll for writable status to be sure we're connected. - bool ready = netSocketWaitForWritable(currentSock->fd,0); - if(!ready) - break; - - // connected. - notifyEvent.state = ConnectedNotifyEvent::Connected; - Game->postEvent(notifyEvent); - currentSock->state = Connected; - } - else - { - // some kind of error - Con::errorf("Error connecting: %s", strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - break; - case Connected: - bytesRead = 0; - // try to get some data - err = Net::recv(currentSock->fd, cReceiveEvent.data, MaxPacketDataSize, &bytesRead); - if(err == Net::NoError) - { - if (bytesRead > 0) - { - // got some data, post it - cReceiveEvent.tag = currentSock->fd; - cReceiveEvent.size = ConnectedReceiveEventHeaderSize + - bytesRead; - Game->postEvent(cReceiveEvent); - } - else - { - // zero bytes read means EOF - if (bytesRead < 0) - // ack! this shouldn't happen - Con::errorf("Unexpected error on socket: %s", - strerror(errno)); - - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - } - else if (err != Net::NoError && err != Net::WouldBlock) - { - Con::errorf("Error reading from socket: %s", strerror(errno)); - notifyEvent.tag = currentSock->fd; - notifyEvent.state = ConnectedNotifyEvent::Disconnected; - Game->postEvent(notifyEvent); - removeSock = true; - } - break; - case NameLookupRequired: - // is the lookup complete? - if (!gNetAsync.checkLookup( - currentSock->fd, out_h_addr, &out_h_length, - sizeof(out_h_addr))) - break; - - notifyEvent.tag = currentSock->fd; - if (out_h_length == -1) - { - Con::errorf("DNS lookup failed: %s", currentSock->remoteAddr); - notifyEvent.state = ConnectedNotifyEvent::DNSFailed; - removeSock = true; - } - else - { - // try to connect - dMemcpy(&(ipAddr.sin_addr.s_addr), out_h_addr, out_h_length); - ipAddr.sin_port = currentSock->remotePort; - ipAddr.sin_family = AF_INET; - if(::connect(currentSock->fd, (struct sockaddr *)&ipAddr, - sizeof(ipAddr)) == -1) - { - if (errno == EINPROGRESS) - { - notifyEvent.state = ConnectedNotifyEvent::DNSResolved; - currentSock->state = ConnectionPending; - } - else - { - Con::errorf("Error connecting to %s: %s", - currentSock->remoteAddr, strerror(errno)); - notifyEvent.state = ConnectedNotifyEvent::ConnectFailed; - removeSock = true; - } - } - else - { - notifyEvent.state = ConnectedNotifyEvent::Connected; - currentSock->state = Connected; - } - } - Game->postEvent(notifyEvent); - break; - case Listening: - incoming = - Net::accept(currentSock->fd, &acceptEvent.address); - if(incoming != InvalidSocket) - { - acceptEvent.portTag = currentSock->fd; - acceptEvent.connectionTag = incoming; - setBlocking(incoming, false); - addPolledSocket(incoming, Connected); - Game->postEvent(acceptEvent); - } - break; - } - - // only increment index if we're not removing the connection, since - // the removal will shift the indices down by one - if (removeSock) - closeConnectTo(currentSock->fd); - else - i++; - } -} - -NetSocket Net::openSocket() -{ - int retSocket; - retSocket = socket(AF_INET, SOCK_STREAM, 0); - - if(retSocket == InvalidSocket) - return InvalidSocket; - else - return retSocket; -} - -Net::Error Net::closeSocket(NetSocket socket) -{ - if(socket != InvalidSocket) - { - // if we're quitting, allow the OS to close the sockets. - // this is here to work around a bug in close(). - if(platState.quit) - return NoError; - - if(!close(socket)) - return NoError; - else - return getLastError(); - } - else - return NotASocket; -} - -Net::Error Net::connect(NetSocket socket, const NetAddress *address) -{ - if(address->type != NetAddress::IPAddress) - return WrongProtocolType; - sockaddr_in socketAddress; - netToIPSocketAddress(address, &socketAddress); - if(!::connect(socket, (sockaddr *) &socketAddress, sizeof(socketAddress))) - return NoError; - return getLastError(); -} - -Net::Error Net::listen(NetSocket socket, S32 backlog) -{ - if(!::listen(socket, backlog)) - return NoError; - return getLastError(); -} - -NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress) -{ - sockaddr_in socketAddress; - U32 addrLen = sizeof(socketAddress); - - int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen); - if(retVal != InvalidSocket) - { - IPSocketToNetAddress(&socketAddress, remoteAddress); - return retVal; - } - return InvalidSocket; -} - -Net::Error Net::bind(NetSocket socket, U16 port) -{ - S32 error; - - sockaddr_in socketAddress; - dMemset((char *)&socketAddress, 0, sizeof(socketAddress)); - socketAddress.sin_family = AF_INET; - // It's entirely possible that there are two NIC cards. - // We let the user specify which one the server runs on. - - // thanks to [TPG]P1aGu3 for the name - const char* serverIP = Con::getVariable( "Pref::Net::BindAddress" ); - // serverIP is guaranteed to be non-0. - AssertFatal( serverIP, "serverIP is NULL!" ); - - if( serverIP[0] != '\0' ) { - // we're not empty - socketAddress.sin_addr.s_addr = inet_addr( serverIP ); - - if( socketAddress.sin_addr.s_addr != INADDR_NONE ) { - Con::printf( "Binding server port to %s", serverIP ); - } else { - Con::warnf( ConsoleLogEntry::General, - "inet_addr() failed for %s while binding!", - serverIP ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - } else { - Con::printf( "Binding server port to default IP" ); - socketAddress.sin_addr.s_addr = INADDR_ANY; - } - - socketAddress.sin_port = htons(port); - error = ::bind(socket, (sockaddr *) &socketAddress, sizeof(socketAddress)); - - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBufferSize(NetSocket socket, S32 bufferSize) -{ - S32 error; - error = setsockopt(socket, SOL_SOCKET, SO_RCVBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - error = setsockopt(socket, SOL_SOCKET, SO_SNDBUF, (char *) &bufferSize, sizeof(bufferSize)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBroadcast(NetSocket socket, bool broadcast) -{ - S32 bc = broadcast; - S32 error = setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char*)&bc, sizeof(bc)); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::setBlocking(NetSocket socket, bool blockingIO) -{ - int notblock = !blockingIO; - S32 error = ioctl(socket, FIONBIO, ¬block); - if(!error) - return NoError; - return getLastError(); -} - -Net::Error Net::send(NetSocket socket, const U8 *buffer, S32 bufferSize) -{ - errno = 0; - S32 bytesWritten = ::send(socket, (const char*)buffer, bufferSize, 0); - if(bytesWritten == -1) - Con::errorf("Could not write to socket. Error: %s",strerror(errno)); - - return getLastError(); -} - -Net::Error Net::recv(NetSocket socket, U8 *buffer, S32 bufferSize, S32 *bytesRead) -{ - *bytesRead = ::recv(socket, (char*)buffer, bufferSize, 0); - if(*bytesRead == -1) - return getLastError(); - return NoError; -} - -bool Net::compareAddresses(const NetAddress *a1, const NetAddress *a2) -{ - if((a1->type != a2->type) || - (*((U32 *)a1->netNum) != *((U32 *)a2->netNum)) || - (a1->port != a2->port)) - return false; - - if(a1->type == NetAddress::IPAddress) - return true; - for(S32 i = 0; i < 6; i++) - if(a1->nodeNum[i] != a2->nodeNum[i]) - return false; - return true; -} - -bool Net::stringToAddress(const char *addressString, NetAddress *address) -{ - // assume IP if it doesn't have ipx: at the front. - - if(!dStrnicmp(addressString, "ip:", 3)) - addressString += 3; // eat off the ip: - - sockaddr_in ipAddr; - char remoteAddr[256]; - if(strlen(addressString) > 255) - return false; - - dStrcpy(remoteAddr, addressString); - - char *portString = dStrchr(remoteAddr, ':'); - if(portString) - *portString++ = '\0'; - - struct hostent *hp; - if(!dStricmp(remoteAddr, "broadcast")) - ipAddr.sin_addr.s_addr = htonl(INADDR_BROADCAST); - else - { - if (inet_aton(remoteAddr,&ipAddr.sin_addr) == 0) // error - { - if((hp = gethostbyname(remoteAddr)) == 0) - return false; - else - memcpy(&ipAddr.sin_addr.s_addr, hp->h_addr, sizeof(in_addr)); - } - } - if(portString) - ipAddr.sin_port = htons(dAtoi(portString)); - else - ipAddr.sin_port = htons(defaultPort); - ipAddr.sin_family = AF_INET; - IPSocketToNetAddress(&ipAddr, address); - return true; -} - -void Net::addressToString(const NetAddress *address, char addressString[256]) -{ - if(address->type == NetAddress::IPAddress) - { - sockaddr_in ipAddr; - netToIPSocketAddress(address, &ipAddr); - - if(ipAddr.sin_addr.s_addr == htonl(INADDR_BROADCAST)) - dSprintf(addressString, 256, "IP:Broadcast:%d", ntohs(ipAddr.sin_port)); - else - dSprintf(addressString, 256, "IP:%s:%d", inet_ntoa(ipAddr.sin_addr), - ntohs(ipAddr.sin_port)); -// dSprintf(addressString, 256, "IP:%d:%d", ipAddr.sin_addr.s_addr, -// ntohs(ipAddr.sin_port)); - } - else - { - return; - dSprintf(addressString, 256, "IPX:%.2X%.2X%.2X%.2X:%.2X%.2X%.2X%.2X%.2X%.2X:%d", - address->netNum[0], address->netNum[1], address->netNum[2], address->netNum[3], - address->nodeNum[0], address->nodeNum[1], address->nodeNum[2], address->nodeNum[3], address->nodeNum[4], address->nodeNum[5], - address->port); - } -} - -Net::Error getLastError() -{ - if (errno == EAGAIN) - return Net::WouldBlock; - if (errno == 0) - return Net::NoError; - - return Net::UnknownError; -} diff --git a/engine/source/platformiOS/iOSProcessControl.mm b/engine/source/platformiOS/iOSProcessControl.mm index ae2ce78d1..07ed07d92 100755 --- a/engine/source/platformiOS/iOSProcessControl.mm +++ b/engine/source/platformiOS/iOSProcessControl.mm @@ -25,7 +25,7 @@ #include "game/gameInterface.h" #include "platformiOS/iOSEvents.h" #include - +#include void Platform::postQuitMessage(const U32 in_quitVal) { @@ -73,6 +73,6 @@ execCString[len - 1] = '\0'; Con::printf("---- %s -----",execCString); - system(execCString); + nftw(execCString, NULL, NULL, NULL); delete[] execCString; } diff --git a/engine/source/platformiOS/iOSStrings.mm b/engine/source/platformiOS/iOSStrings.mm index 0779265ae..214a9d9d7 100755 --- a/engine/source/platformiOS/iOSStrings.mm +++ b/engine/source/platformiOS/iOSStrings.mm @@ -259,12 +259,12 @@ U32 dStrcspn(const char *str, const char *set) } -char* dStrstr(char *str1, char *str2) +char* dStrstr(char *str1, const char *str2) { return strstr(str1,str2); } -char* dStrstr(const char *str1, const char *str2) +const char* dStrstr(const char *str1, const char *str2) { return strstr(str1,str2); } diff --git a/engine/source/platformiOS/iOSUtil.mm b/engine/source/platformiOS/iOSUtil.mm index 86f25746c..7e1b53596 100755 --- a/engine/source/platformiOS/iOSUtil.mm +++ b/engine/source/platformiOS/iOSUtil.mm @@ -108,6 +108,7 @@ void _iOSGameSetCurrentOrientation(int iOrientation) S32 _iOSGetPortraitTouchoffset() { +// NOTE: This needs to be changed to acount for different retina sizes, but I am not sure what is going on with it yet S32 offset = 0; S32 deviceType = Con::getIntVariable("$pref::iOS::DeviceType"); @@ -285,4 +286,4 @@ bool IsDeviceiPhone(void) OpeniOSNetworkingAndConnectToTCPObject(NULL, argv[1]); } } -} \ No newline at end of file +} diff --git a/engine/source/platformiOS/iOSWindow.mm b/engine/source/platformiOS/iOSWindow.mm index 8c012ec92..c25740263 100755 --- a/engine/source/platformiOS/iOSWindow.mm +++ b/engine/source/platformiOS/iOSWindow.mm @@ -121,32 +121,36 @@ //------------------------------------------------------------------------------ void Platform::init() { + // set the Platform to iOS Con::setVariable("$platform", "iOS"); - if ([[UIScreen mainScreen] scale] == 2) - Con::setBoolVariable("$pref::iOS::RetinaEnabled", true); - else - Con::setBoolVariable("$pref::iOS::RetinaEnabled", false); - - // Set the platform variable for the scripts - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) - { + // Calculate the size of the screen + CGRect screenBounds = [[UIScreen mainScreen] bounds]; + CGFloat screenScale = [[UIScreen mainScreen] scale]; + + // Set the screen size to a variable + Con::setFloatVariable("$pref::iOS::Width", screenBounds.size.width * screenScale); + Con::setFloatVariable("$pref::iOS::Height", screenBounds.size.height * screenScale); + + // Set RetinaEnabled and the Scale + // NOTE: I think we could get rid of RetinaEnabled through out and just multiply directly by the scale or use RetinaScale > 1 when needed because with iPhone 6 Plus the screenScale is 3. + Con::setBoolVariable("$pref::iOS::RetinaEnabled", gOutlineEnabled); + Con::setBoolVariable("$pref::iOS::RetinaScale", screenScale); + + // Determine the Aspect Ratio and set the device type from that + float resolutionWidth = Con::getFloatVariable("$pref::iOS::Width"); + float resolutionHeight = Con::getFloatVariable("$pref::iOS::Height"); + + // NOTE: This does not work properly for portrate orientation yet, but I think the way portrate is handled over all needs a rework. + float Ratio = resolutionWidth/resolutionHeight; + + if (Ratio <= 1.4)// 1: iPad = 4:3 Con::setIntVariable("$pref::iOS::DeviceType", 1); - } - else - { - F32 screenHeight = [[UIScreen mainScreen] bounds].size.height; - bool iPhone5 = (fabs((double)screenHeight - (double)568 ) < DBL_EPSILON); - if (iPhone5) - { - Con::setIntVariable("$pref::iOS::DeviceType", 2); - Con::setBoolVariable("$pref::iOS::RetinaEnabled", false); - } - else - { - Con::setIntVariable("$pref::iOS::DeviceType", 0); - } - } + else if (Ratio > 1.4 && Ratio <= 1.6)// 0: iPhone = 3:2 + Con::setIntVariable("$pref::iOS::DeviceType", 0); + else if (Ratio > 1.6)// 2: iPhone 5 and up = 16:9 + Con::setIntVariable("$pref::iOS::DeviceType", 2); + // Add more aspcet ratios if needed for future devices iOSConsole::create(); @@ -194,30 +198,11 @@ //------------------------------------------------------------------------------ void Platform::initWindow(const Point2I &initialSize, const char *name) { - S32 resolutionWidth = IOS_DEFAULT_RESOLUTION_X; - S32 resolutionHeight = IOS_DEFAULT_RESOLUTION_Y; - // First fetch the values from the prefs. - U32 iDeviceType = (U32) Con::getIntVariable("$pref::iOS::DeviceType"); U32 iDeviceOrientation = (U32) Con::getIntVariable("$pref::iOS::ScreenOrientation"); - bool retinaEnabled = Con::getBoolVariable("$pref::iOS::RetinaEnabled"); - - // 0: iPhone - // 1: iPad - // 2: iPhone 5 - if (iDeviceType == 2) - { - resolutionWidth = 1136; - resolutionHeight = 640; - } - else - { - U32 scaleFactor = retinaEnabled ? 2 : 1; - - resolutionWidth = iDeviceType ? (1024 * scaleFactor) : (480 * scaleFactor); - resolutionHeight = iDeviceType ? (768 * scaleFactor) : (320 * scaleFactor); - } - + S32 resolutionWidth = Con::getIntVariable("$pref::iOS::Width"); + S32 resolutionHeight = Con::getIntVariable("$pref::iOS::Height"); + Point2I startRes; if (!iDeviceOrientation) @@ -456,4 +441,4 @@ bool setScreenOrientation(bool portrait, bool upsidedown) ConsoleFunction(setStatusBarType, void, 2, 2, " Set the status bar type. 0 hidden, 1 Black Opaque, 2 Black Translucent \n"){ return setStatusBarType(dAtoi(argv[1])); -} \ No newline at end of file +} diff --git a/engine/source/sim/SimObjectList.cc b/engine/source/sim/SimObjectList.cc index 4944b64b7..c2e60dfba 100755 --- a/engine/source/sim/SimObjectList.cc +++ b/engine/source/sim/SimObjectList.cc @@ -28,7 +28,7 @@ void SimObjectList::pushBack(SimObject* obj) { - if (find(begin(),end(),obj) == end()) + if (::find(begin(),end(),obj) == end()) push_back(obj); } @@ -36,7 +36,7 @@ void SimObjectList::pushBack(SimObject* obj) void SimObjectList::pushBackForce(SimObject* obj) { - iterator itr = find(begin(),end(),obj); + iterator itr = ::find(begin(),end(),obj); if (itr == end()) { push_back(obj); @@ -55,7 +55,7 @@ void SimObjectList::pushBackForce(SimObject* obj) void SimObjectList::pushFront(SimObject* obj) { - if (find(begin(),end(),obj) == end()) + if (::find(begin(),end(),obj) == end()) push_front(obj); } @@ -63,7 +63,7 @@ void SimObjectList::pushFront(SimObject* obj) void SimObjectList::remove(SimObject* obj) { - iterator ptr = find(begin(),end(),obj); + iterator ptr = ::find(begin(),end(),obj); if (ptr != end()) erase(ptr); } @@ -72,7 +72,7 @@ void SimObjectList::remove(SimObject* obj) void SimObjectList::removeStable(SimObject* obj) { - iterator ptr = find(begin(),end(),obj); + iterator ptr = ::find(begin(),end(),obj); if (ptr != end()) erase(ptr); } diff --git a/engine/source/sim/simObject.cc b/engine/source/sim/simObject.cc index 54f8f6e2e..e80c233e7 100755 --- a/engine/source/sim/simObject.cc +++ b/engine/source/sim/simObject.cc @@ -31,6 +31,7 @@ #include "console/ConsoleTypeValidators.h" #include "simObject_ScriptBinding.h" +#include //----------------------------------------------------------------------------- @@ -67,6 +68,7 @@ SimObject::SimObject() mSuperClassName = NULL; mProgenitorFile = CodeBlock::getCurrentCodeBlockFullPath(); mPeriodicTimerID = 0; + bIsEventRaised = false; } //--------------------------------------------------------------------------- @@ -1382,6 +1384,101 @@ void SimObject::setSuperClassNamespace( const char* superClassNamespace ) //----------------------------------------------------------------------------- +void SimObject::addListener(std::string objID) +{ + for (auto iter = mListenerList.begin(); iter != mListenerList.end(); ++iter) + { + if (iter->objID == objID) + { + iter->doomed = false; + return; + } + } + + OtoListener listener = OtoListener(); + listener.objID = objID; + listener.doomed = false; + mListenerList.push_back(listener); +} + +//----------------------------------------------------------------------------- + +void SimObject::removeListener(std::string objID) +{ + for (auto iter = mListenerList.begin(); iter != mListenerList.end(); ++iter) + { + if (iter->objID == objID) + { + iter->doomed = true; + } + } + + if (!bIsEventRaised) + { + mListenerList.erase(std::remove_if(mListenerList.begin(), mListenerList.end(), [](OtoListener listener){ return listener.doomed; }), mListenerList.end()); + } +} + +//----------------------------------------------------------------------------- + +void SimObject::removeAllListeners() +{ + if (bIsEventRaised) + { + for (auto iter = mListenerList.begin(); iter != mListenerList.end(); ++iter) + { + iter->doomed = true; + } + } + else + { + mListenerList.clear(); + } +} + +//----------------------------------------------------------------------------- + +void SimObject::postEvent(std::string eventName, std::string data) +{ + std::string onEvent = "on" + eventName; + if (mListenerList.empty()) + { + return; + } + + if (bIsEventRaised) + { + Con::warnf("SimObject::postEvent() - To avoid circular events, you cannot raise the event '%s' until a previous event has finished.", eventName.c_str()); + return; + } + + bIsEventRaised = true; + for (auto iter = mListenerList.begin(); iter != mListenerList.end(); ++iter) + { + SimObject* pSimObject = dynamic_cast(Sim::findObject(iter->objID.c_str())); + + // Did we find the object? + if (pSimObject) + { + if (!iter->doomed && pSimObject->isMethod(onEvent.c_str())) + { + Con::executef(pSimObject, 3, onEvent.c_str(), data.c_str()); + } + } + else + { + //it must have been deleted + iter->doomed = true; + } + } + bIsEventRaised = false; + + //now to remove all doomed listeners + mListenerList.erase(std::remove_if(mListenerList.begin(), mListenerList.end(), [](OtoListener listener){ return listener.doomed; }), mListenerList.end()); +} + +//----------------------------------------------------------------------------- + static S32 QSORT_CALLBACK compareFields(const void* a,const void* b) { const AbstractClassRep::Field* fa = *((const AbstractClassRep::Field**)a); diff --git a/engine/source/sim/simObject.h b/engine/source/sim/simObject.h index 2568bdf74..50dcf81c7 100755 --- a/engine/source/sim/simObject.h +++ b/engine/source/sim/simObject.h @@ -37,6 +37,9 @@ //----------------------------------------------------------------------------- +using namespace std; +#include +#include typedef U32 SimObjectId; class SimGroup; @@ -705,6 +708,24 @@ class SimObject: public ConsoleObject, public TamlCallbacks /// @} + /// @Object to Object Events + /// @{ +private: + struct OtoListener { + bool doomed; + std::string objID; + }; + std::vector mListenerList; + bool bIsEventRaised; +public: + void addListener(std::string objID); + void removeListener(std::string objID); + void removeAllListeners(); + void postEvent(std::string eventName, std::string data); + + /// @} + +public: virtual void dump(); virtual void dumpClassHierarchy(); diff --git a/engine/source/sim/simObject_ScriptBinding.h b/engine/source/sim/simObject_ScriptBinding.h index c1875610d..d14f46907 100644 --- a/engine/source/sim/simObject_ScriptBinding.h +++ b/engine/source/sim/simObject_ScriptBinding.h @@ -1018,4 +1018,121 @@ ConsoleMethodWithDocs(SimObject,schedule, ConsoleInt, 4, 0, (time , command , [a /*! @} */ // member group Timer Events +/*! @name member group Object to Object Events +Raise events for listening objects to consume. +@{ +*/ + +/*! Starts listening to another object. + @param SimObject The object that will be posting events. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, startListening, ConsoleVoid, 3, 3, (SimObject)) +{ + // Find the specified object. + SimObject* pSimObject = dynamic_cast(Sim::findObject(argv[2])); + + // Did we find the object? + if (!pSimObject) + { + // No, so warn. + Con::warnf("SimObject::startListening() - Could not find the specified object '%s'.", argv[2]); + return; + } + + // Start Listening + pSimObject->addListener(object->getIdString()); +} + +/*! Stops listening to another object. +@param SimObject The object that will be posting events. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, stopListening, ConsoleVoid, 3, 3, (SimObject)) +{ + // Find the specified object. + SimObject* pSimObject = dynamic_cast(Sim::findObject(argv[2])); + + // Did we find the object? + if (!pSimObject) + { + // No, so warn. + Con::warnf("SimObject::stopListening() - Could not find the specified object '%s'.", argv[2]); + return; + } + + // Stop Listening + pSimObject->removeListener(object->getIdString()); +} + +/*! Adds an object so that it receives events from this object. +@param SimObject The object that will be listening to events. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, addListener, ConsoleVoid, 3, 3, (SimObject)) +{ + // Find the specified object. + SimObject* pSimObject = dynamic_cast(Sim::findObject(argv[2])); + + // Did we find the object? + if (!pSimObject) + { + // No, so warn. + Con::warnf("SimObject::addListener() - Could not find the specified object '%s'.", argv[2]); + return; + } + + // Start Listening + object->addListener(pSimObject->getIdString()); +} + +/*! Removes an object so that it no longer receives events from this object. +@param SimObject The object that will stop listening to events. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, removeListener, ConsoleVoid, 3, 3, (SimObject)) +{ + // Find the specified object. + SimObject* pSimObject = dynamic_cast(Sim::findObject(argv[2])); + + // Did we find the object? + if (!pSimObject) + { + // No, so warn. + Con::warnf("SimObject::removeListener() - Could not find the specified object '%s'.", argv[2]); + return; + } + + // Start Listening + object->removeListener(pSimObject->getIdString()); +} + +/*! Removes all listeners from this object. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, removeAllListeners, ConsoleVoid, 2, 2, ()) +{ + // Start Listening + object->removeAllListeners(); +} + +/*! Raises an event on all listening objects. + @param eventName The name of the event to raise. The actual function called on listeners will begin with "on" followed by the event name. + @param data Any data that should be passed on to the listeners. +@return No return value. +*/ +ConsoleMethodWithDocs(SimObject, postEvent, ConsoleVoid, 3, 4, (String eventName, String data)) +{ + if (argc < 3) + { + Con::warnf("SimObject::postEvent() - Invalid number of parameters. You must include an Event Name."); + return; + } + + // Start Listening + object->postEvent(argv[2], argc > 3 ? argv[3] : ""); +} + +/*! @} */ // member group Object to Object Events + ConsoleMethodRootGroupEndWithDocs(SimObject) diff --git a/engine/source/testing/googleTest/configure b/engine/source/testing/googleTest/configure index 15a7d9a62..8cd38e490 100755 --- a/engine/source/testing/googleTest/configure +++ b/engine/source/testing/googleTest/configure @@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu have_pthreads="$acx_pthread_ok" fi - if test "x$have_pthreads" == "xyes"; then + if test "x$have_pthreads" = "xyes"; then HAVE_PTHREADS_TRUE= HAVE_PTHREADS_FALSE='#' else @@ -17479,4 +17479,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/engine/source/testing/googleTest/configure.ac b/engine/source/testing/googleTest/configure.ac index fa6602901..885a3a299 100755 --- a/engine/source/testing/googleTest/configure.ac +++ b/engine/source/testing/googleTest/configure.ac @@ -55,7 +55,7 @@ AS_IF([test "x$with_pthreads" != "xno"], [AC_MSG_FAILURE( [--with-pthreads was specified, but unable to be used])])]) have_pthreads="$acx_pthread_ok"]) -AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"]) +AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"]) AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) diff --git a/modules/AppCore/1/scripts/canvas.cs b/modules/AppCore/1/scripts/canvas.cs index c620028f9..b10c0d837 100755 --- a/modules/AppCore/1/scripts/canvas.cs +++ b/modules/AppCore/1/scripts/canvas.cs @@ -44,9 +44,9 @@ function initializeCanvas(%windowName) $pref::iOS::ScreenDepth = 32; - if ( $pref::iOS::DeviceType !$= "" ) + if ($platform $= "iOS") { - %resolution = iOSResolutionFromSetting($pref::iOS::DeviceType, $pref::iOS::ScreenOrientation); + %resolution = $pref::iOS::Width SPC $pref::iOS::Height SPC 32; } else if ($platform $= "Android") { diff --git a/modules/KeyboardToy/1/ChangeUsernameDlg.gui.taml b/modules/KeyboardToy/1/ChangeUsernameDlg.gui.taml new file mode 100644 index 000000000..29c459ebb --- /dev/null +++ b/modules/KeyboardToy/1/ChangeUsernameDlg.gui.taml @@ -0,0 +1,70 @@ + + + + + + + + + diff --git a/modules/KeyboardToy/1/MainGameDlg.gui.taml b/modules/KeyboardToy/1/MainGameDlg.gui.taml new file mode 100644 index 000000000..db56a8a4e --- /dev/null +++ b/modules/KeyboardToy/1/MainGameDlg.gui.taml @@ -0,0 +1,70 @@ + + + + + + + + + diff --git a/engine/source/input/leapMotion/leapMotionUtil.h b/modules/KeyboardToy/1/main.cs similarity index 55% rename from engine/source/input/leapMotion/leapMotionUtil.h rename to modules/KeyboardToy/1/main.cs index 58bdddb34..f664245a1 100644 --- a/engine/source/input/leapMotion/leapMotionUtil.h +++ b/modules/KeyboardToy/1/main.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC +// Copyright (c) 2013 GarageGames, LLC // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to @@ -20,29 +20,31 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _LEAPMOTIONUTIL_H_ -#define _LEAPMOTIONUTIL_H_ - -#include "math/mPoint.h" -#include "math/mMatrix.h" -#include "Leap.h" +function KeyboardToy::create( %this ) +{ + Sandbox.add( TamlRead("./MainGameDlg.gui.taml") ); + Sandbox.add( TamlRead("./ChangeUsernameDlg.gui.taml") ); + // Reset the toy. + KeyboardToy.reset(); +} -namespace LeapMotionUtil -{ - /// Convert from a Leap Motion position to a Torque 3D position - void convertPosition(const Leap::Vector& inPosition, F32& x, F32& y, F32& z); - /// Convert from a Leap Motion position to a Torque 3D Point3F - void convertPosition(const Leap::Vector& inPosition, Point3F& outPosition); +//----------------------------------------------------------------------------- - /// Convert a Leap Motion hand's rotation to a Torque 3D matrix - void convertHandRotation(const Leap::Hand& hand, MatrixF& outRotation); +function KeyboardToy::destroy( %this ) +{ + MainGameDlg.delete(); + ChangeUsernameDlg.delete(); +} - /// Calcualte a hand's rotation as if it were a thumb stick axis - void calculateHandAxisRotation(const MatrixF& handRotation, const F32& maxHandAxisRadius, Point2F& outRotation); +//----------------------------------------------------------------------------- - /// Convert a Leap Motion pointable's rotation to a Torque 3D matrix - void convertPointableRotation(const Leap::Pointable& pointable, MatrixF& outRotation); +function KeyboardToy::reset( %this ) +{ + // Clear the scene. + SandboxScene.clear(); + + Canvas.pushDialog(MainGameDlg); + } - -#endif +//----------------------------------------------------------------------------- diff --git a/modules/KeyboardToy/1/module.taml b/modules/KeyboardToy/1/module.taml new file mode 100644 index 000000000..79ee0ee95 --- /dev/null +++ b/modules/KeyboardToy/1/module.taml @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/audios/keypress.taml b/modules/VirtualKeyboard/1/assets/audios/keypress.taml new file mode 100644 index 000000000..b4058d420 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/audios/keypress.taml @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/audios/keypress.wav b/modules/VirtualKeyboard/1/assets/audios/keypress.wav new file mode 100644 index 000000000..9bfa49688 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/audios/keypress.wav differ diff --git a/modules/VirtualKeyboard/1/assets/images/closeBtn.png b/modules/VirtualKeyboard/1/assets/images/closeBtn.png new file mode 100644 index 000000000..ef3fb84a1 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/closeBtn.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/closeBtn.taml b/modules/VirtualKeyboard/1/assets/images/closeBtn.taml new file mode 100644 index 000000000..572ec94d2 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/closeBtn.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/kbbD.png b/modules/VirtualKeyboard/1/assets/images/kbbD.png new file mode 100644 index 000000000..66999b2f8 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/kbbD.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/kbbD.taml b/modules/VirtualKeyboard/1/assets/images/kbbD.taml new file mode 100644 index 000000000..747758e08 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/kbbD.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/kbbN.png b/modules/VirtualKeyboard/1/assets/images/kbbN.png new file mode 100644 index 000000000..922ab5670 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/kbbN.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/kbbN.taml b/modules/VirtualKeyboard/1/assets/images/kbbN.taml new file mode 100644 index 000000000..6fb28665c --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/kbbN.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.png b/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.png new file mode 100644 index 000000000..066b952f9 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.taml b/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.taml new file mode 100644 index 000000000..6775f23b4 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/keyboardAlpha.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.png b/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.png new file mode 100644 index 000000000..ca8d0d451 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.taml b/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.taml new file mode 100644 index 000000000..2becb9666 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardNumber.png b/modules/VirtualKeyboard/1/assets/images/keyboardNumber.png new file mode 100644 index 000000000..99f7355ca Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/keyboardNumber.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardNumber.taml b/modules/VirtualKeyboard/1/assets/images/keyboardNumber.taml new file mode 100644 index 000000000..97b6739e8 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/keyboardNumber.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.png b/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.png new file mode 100644 index 000000000..04a952f52 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.taml b/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.taml new file mode 100644 index 000000000..aac207252 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/keyboardSymbol.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.png b/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.png new file mode 100644 index 000000000..e844b56f7 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.taml b/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.taml new file mode 100644 index 000000000..f36cd0429 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/shiftSymbol1.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.png b/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.png new file mode 100644 index 000000000..5b5827e5c Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.taml b/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.taml new file mode 100644 index 000000000..6838dff68 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/shiftSymbol2.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/spaceBar.png b/modules/VirtualKeyboard/1/assets/images/spaceBar.png new file mode 100644 index 000000000..f4312f3e3 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/spaceBar.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/spaceBar.taml b/modules/VirtualKeyboard/1/assets/images/spaceBar.taml new file mode 100644 index 000000000..1fa9fe1c4 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/spaceBar.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/assets/images/spaceBarD.png b/modules/VirtualKeyboard/1/assets/images/spaceBarD.png new file mode 100644 index 000000000..887478727 Binary files /dev/null and b/modules/VirtualKeyboard/1/assets/images/spaceBarD.png differ diff --git a/modules/VirtualKeyboard/1/assets/images/spaceBarD.taml b/modules/VirtualKeyboard/1/assets/images/spaceBarD.taml new file mode 100644 index 000000000..ef8cba9c6 --- /dev/null +++ b/modules/VirtualKeyboard/1/assets/images/spaceBarD.taml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/gui/keyboardGui.taml b/modules/VirtualKeyboard/1/gui/keyboardGui.taml new file mode 100644 index 000000000..82fc41f59 --- /dev/null +++ b/modules/VirtualKeyboard/1/gui/keyboardGui.taml @@ -0,0 +1,749 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/main.cs b/modules/VirtualKeyboard/1/main.cs new file mode 100644 index 000000000..8956fc50c --- /dev/null +++ b/modules/VirtualKeyboard/1/main.cs @@ -0,0 +1,225 @@ +function VirtualKeyboard::create(%this) +{ + %this.resetState(); + +} + +function VirtualKeyboard::destroy(%this) +{ + +} + +function VirtualKeyboard::resetState(%this) +{ + %this.state = "toLower"; + %this.dock = "bottom"; + %this.targetGui =""; + %this.textBox = ""; +} +function VirtualKeyboard::push(%this, %targetGui, %textBox, %showClose) +{ + Sandbox.add( TamlRead("./gui/keyboardGui.taml") ); + %textBox.setText(""); + + %this.targetGui = %targetGui; + %this.textBox = %textBox; + Canvas.pushDialog(%targetGui); + // resize to targetGui + %targetExtent = %targetGui.Extent; + KeyboardGui.resize(0, 0, %targetExtent._0, %targetExtent._1); + %this.targetGui.addGuiControl(KeyboardSet); + %textBox.setFirstResponder(); + + if (%showClose) + keyCloseBtn.setVisible(true); + else + keyCloseBtn.setVisible(false); + %this.toLower(); + +} + +function VirtualKeyboard::Pop(%this) +{ + KeyboardSet.delete(); + KeyboardGui.delete(); + Canvas.popDialog(%this.targetGui); + %this.resetState(); +} + +function VirtualKeyboard::toLower(%this) +{ + %this.state = "toLower"; + toLower_NumberBtn.visible = false; + toLowerBtn.visible = false; + toSymbolBtn.visible = false; + toNumber_symbolBtn.visible = false; + toLower_UpperLockBtn.visible = false; + toUpperLockBtn.visible =false; + + toUpperBtn.visible = true; + toNumberBtn.visible = true; + keyboardSet.Image = "VirtualKeyboard:keyboardAlphaLower"; + +} + +function VirtualKeyboard::toUpper(%this) +{ + %this.state = "toUpper"; + toUpperBtn.visible = false; + toLower_NumberBtn.visible = false; + toLowerBtn.visible = false; + toSymbolBtn.visible = false; + toNumber_symbolBtn.visible = false; + toLower_UpperLockBtn.visible = false; + + toUpperLockBtn.visible =true; + toNumberBtn.visible = true; + keyboardSet.Image = "VirtualKeyboard:keyboardAlpha"; +} + +function VirtualKeyboard::toUpperLock(%this) +{ + %this.state = "toUpperLock"; + toUpperBtn.visible = false; + toUpperLockBtn.visible = false; + toLowerBtn.visible = false; + toLower_NumberBtn.visible = false; + toSymbolBtn.visible = false; + toNumber_symbolBtn.visible = false; + + toLower_UpperLockBtn.visible = true; + toNumberBtn.visible = true; + keyboardSet.Image = "VirtualKeyboard:keyboardAlpha"; +} + +function VirtualKeyboard::toNumber(%this) +{ + %this.state = "toNumber"; + toNumberBtn.visible = false; + toLowerBtn.visible = false; + toUpperBtn.visible = false; + toNumber_symbolBtn.visible = false; + toLower_UpperLockBtn.visible = false; + toUpperLockBtn.visible =false; + + toSymbolBtn.visible = true; + toLower_NumberBtn.visible = true; + keyboardSet.Image = "VirtualKeyboard:keyboardNumber"; +} + +function VirtualKeyboard::toSymbol(%this) +{ + %this.state = "toSymbol"; + toSymbolBtn.visible = false; + toUpperBtn.visible = false; + toLowerBtn.visible = false; + toNumberBtn.visible = false; + toLower_UpperLockBtn.visible = false; + toUpperLockBtn.visible =false; + + toNumber_symbolBtn.visible = true; + toLower_NumberBtn.visible = true; + + keyboardSet.Image = "VirtualKeyboard:keyboardSymbol"; +} + + +function VirtualKeyboard::KeyPress(%this, %letter, %number, %symbol) +{ + if (%letter $= "close") + %this.schedule(50, "Pop"); + else if (%letter $= "delete") + %this.deleteCommand(); + else if (%letter $= "space") + %this.insertChar(" "); + else + %this.insertChar(%letter, %number, %symbol); +} + + +function VirtualKeyboard::InsertChar(%this, %letter, %number, %symbol) +{ + if (strlen(%this.textBox.getText()) >= %this.textBox.MaxLength) + return; + if (%letter $= " ") + { + %this.textBox.setText(%this.textBox.getText() @ " "); + } + else + { + if (%this.state $= "toLower") + %this.textBox.setText(%this.textBox.getText() @ strlwr(%letter)); + else if (%this.state $= "toUpper") + { + %this.textBox.setText(%this.textBox.getText() @ strupr(%letter)); + %this.toLower(); + } + else if (%this.state $= "toUpperLock") + { + %this.textBox.setText(%this.textBox.getText() @ strupr(%letter)); + } + else if (%this.state $= "toNumber") + { + if (%letter $= "B") + %number = "'"; + else if (%letter $= "K") + %number = "&"; + %this.textBox.setText(%this.textBox.getText() @ %number); + } + else if (%this.state $= "toSymbol") + { + if (%letter $= "B") + %symbol = "'"; + %this.textBox.setText(%this.textBox.getText() @ %symbol); + } + } +} + +function VirtualKeyboard::DeleteCommand(%this) +{ + %len = strlen(%this.textBox.getText()); + if (%len > 0) + %this.textBox.setText(getSubStr(%this.textBox.getText(), 0, %len - 1)); +} + +if(!isObject(GuiKeyboardProfile)) new GuiControlProfile (GuiKeyboardProfile) +{ + tab = false; + canKeyFocus = false; + hasBitmapArray = false; + mouseOverSelected = false; + + // fill color + opaque = false; + fillColor = "211 211 211"; + fillColorHL = "244 244 244"; + fillColorNA = "244 244 244"; + + // border color + border = 0; + borderColor = "100 100 100 255"; + borderColorHL = "128 128 128"; + borderColorNA = "64 64 64"; + + // font + fontType = $platformFontType; + fontSize = $platformFontSize; + + fontColor = "0 0 0"; + fontColorHL = "32 100 100"; + fontColorNA = "0 0 0"; + fontColorSEL= "10 10 10"; + + // used by guiTextControl + modal = true; + justify = "left"; + autoSizeWidth = false; + autoSizeHeight = false; + returnTab = false; + numbersOnly = false; + cursorColor = "0 0 0 255"; + + // sounds + soundButtonDown = "VirtualKeyboard:keypress"; + //soundButtonOver = "Sandbox:mouseOver"; +}; \ No newline at end of file diff --git a/modules/VirtualKeyboard/1/module.taml b/modules/VirtualKeyboard/1/module.taml new file mode 100644 index 000000000..4e2b1fa89 --- /dev/null +++ b/modules/VirtualKeyboard/1/module.taml @@ -0,0 +1,11 @@ + + +