Merge branch 'Preview4_0' of https://github.com/rextimmy/Torque3D into Preview4_0

This commit is contained in:
Areloch 2019-12-04 00:29:55 -06:00
commit 551df5e92a
2707 changed files with 0 additions and 368907 deletions

Binary file not shown.

Binary file not shown.

View file

@ -1 +0,0 @@
Ready to hold your generated projects

View file

@ -1 +0,0 @@
Ready to hold your generated projects

View file

@ -1 +0,0 @@
Ready to hold your generated projects

View file

@ -1,66 +0,0 @@
@echo off
REM Handle our optional parameters
SET COMPILER=%1
SET CONFIG=%2
IF NOT DEFINED COMPILER SET COMPILER=VS2008
IF NOT DEFINED CONFIG SET CONFIG=Release
REM Setting up some variables
REM Detecting the correct Program Files
IF DEFINED PROGRAMFILES(X86) SET PROGRAMROOT=%ProgramFiles(x86)%
IF NOT DEFINED PROGRAMROOT SET PROGRAMROOT=%ProgramFiles%
REM First the defaults (set up for VS2008 by default)
SET ENVVAR="%PROGRAMROOT%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
SET BUILDCMD=devenv.com
SET OPTIONS= /build "%CONFIG%|Win32"
SET BUILDDIR="VisualStudio 2008"
REM Handle the non-defaults
IF %COMPILER% == VS2005 SET ENVVAR="%PROGRAMROOT%\Microsoft Visual Studio 8\VC\vcvarsall.bat"
IF %COMPILER% == VS2010 SET ENVVAR="%PROGRAMROOT%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
IF EXIST "%PROGRAMROOT%\Xoreax\IncrediBuild\BuildConsole.exe" SET BUILDCMD="%PROGRAMROOT%\Xoreax\IncrediBuild\BuildConsole.exe"
IF EXIST "%PROGRAMROOT%\Xoreax\IncrediBuild\BuildConsole.exe" SET OPTIONS=/build "%CONFIG%|Win32"
IF %COMPILER% == VS2005 SET BUILDDIR="VisualStudio 2005"
IF %COMPILER% == VS2010 SET BUILDDIR="VisualStudio 2010"
echo Building all solutions under %COMPILER% with the %CONFIG% configuration
echo Initializing %COMPILER% environment variables...
call %ENVVAR%
echo Initializing the DirectX SDK environment variables...
IF "%DXSDK_DIR%" == "" goto error_no_DXSDK_DIR
call "%DXSDK_DIR%Utilities\Bin\dx_setenv.cmd" x86
echo Moving to our build directory
cd %BUILDDIR%
echo - Building
for %%a in (*.sln) do %BUILDCMD% "%%a" %OPTIONS% & IF ERRORLEVEL 1 goto error_compile
REM It is just polite for a batch file to leave you in the same dir you started in
cd ..
REM We were successful in everything so go to the end
goto :end
:error_no_DXSDK_DIR
@echo ERROR: DXSDK_DIR variable is not set. Make sure the DirectX SDK is installed properly.
@goto end_error
:error_compile
@echo ERROR: There was an error compiling a solution in %CD%
@goto end_error
:end_error
EXIT 1
:end

View file

@ -1,82 +0,0 @@
<?php
//-----------------------------------------------------------------------------
// 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.
//-----------------------------------------------------------------------------
setPlatform( 'win32' );
// Supporing Libs
includeLib( 'mng' );
includeLib( 'png' );
includeLib( 'ungif' );
includeLib( 'zlib' );
includeLib( 'jpeg' );
includeLib( 'tinyxml' );
includeLib( 'opcode' );
includeLib( 'libvorbis' );
includeLib( 'libogg' );
includeLib( 'squish' );
includeLib( 'collada_dom' );
includeLib( 'pcre' );
includeLib( 'd3dx8dll' );
/////// Stub "lib" with dependencies to trigger a full compile
beginLibConfig( 'Torque 3D Supporting Libs', '{1E68C046-26D7-4AD9-BEF2-590C6B99B40A}' );
/// Dependencies
addProjectDependency( 'collada_dom' );
addProjectDependency( 'd3dx8dll' );
addProjectDependency( 'libogg' );
addProjectDependency( 'libvorbis' );
addProjectDependency( 'ljpeg' );
addProjectDependency( 'lmng' );
addProjectDependency( 'lpng' );
addProjectDependency( 'lungif' );
addProjectDependency( 'opcode' );
addProjectDependency( 'pcre' );
addProjectDependency( 'squish' );
addProjectDependency( 'tinyxml' );
addProjectDependency( 'zlib' );
endLibConfig();
///////////////// And our solution
beginSolutionConfig( 'Torque 3D Supporting Libs', '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}' );
addSolutionProjectRef( 'Torque 3D Supporting Libs' );
addSolutionProjectRef( 'collada_dom' );
addSolutionProjectRef( 'd3dx8dll' );
addSolutionProjectRef( 'libogg' );
addSolutionProjectRef( 'libvorbis' );
addSolutionProjectRef( 'ljpeg' );
addSolutionProjectRef( 'lmng' );
addSolutionProjectRef( 'lpng' );
addSolutionProjectRef( 'lungif' );
addSolutionProjectRef( 'opcode' );
addSolutionProjectRef( 'pcre' );
addSolutionProjectRef( 'squish' );
addSolutionProjectRef( 'tinyxml' );
addSolutionProjectRef( 'zlib' );
endSolutionConfig();
?>

View file

@ -1,80 +0,0 @@
<?php
//-----------------------------------------------------------------------------
// 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.
//-----------------------------------------------------------------------------
setPlatform( 'mac' );
// Supporing Libs
includeLib( 'mng' );
includeLib( 'png' );
includeLib( 'ungif' );
includeLib( 'zlib' );
includeLib( 'jpeg' );
includeLib( 'tinyxml' );
includeLib( 'opcode' );
includeLib( 'libvorbis' );
includeLib( 'libogg' );
includeLib( 'squish' );
includeLib( 'collada_dom' );
includeLib( 'pcre' );
includeLib( 'd3dx8dll' );
/////// Stub "lib" with dependencies to trigger a full compile
beginLibConfig( 'Torque 3D Supporting Libs', '{1E68C046-26D7-4AD9-BEF2-590C6B99B40A}' );
/// Dependencies
addProjectDependency( 'collada_dom' );
addProjectDependency( 'libogg' );
addProjectDependency( 'libvorbis' );
addProjectDependency( 'ljpeg' );
addProjectDependency( 'lmng' );
addProjectDependency( 'lpng' );
addProjectDependency( 'lungif' );
addProjectDependency( 'opcode' );
addProjectDependency( 'pcre' );
addProjectDependency( 'squish' );
addProjectDependency( 'tinyxml' );
addProjectDependency( 'zlib' );
endLibConfig();
///////////////// And our solution
beginSolutionConfig( 'Torque 3D Supporting Libs', '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}' );
addSolutionProjectRef( 'Torque 3D Supporting Libs' );
addSolutionProjectRef( 'collada_dom' );
addSolutionProjectRef( 'libogg' );
addSolutionProjectRef( 'libvorbis' );
addSolutionProjectRef( 'ljpeg' );
addSolutionProjectRef( 'lmng' );
addSolutionProjectRef( 'lpng' );
addSolutionProjectRef( 'lungif' );
addSolutionProjectRef( 'opcode' );
addSolutionProjectRef( 'pcre' );
addSolutionProjectRef( 'squish' );
addSolutionProjectRef( 'tinyxml' );
addSolutionProjectRef( 'zlib' );
endSolutionConfig();
?>

View file

@ -1,13 +0,0 @@
@echo off
SET TORQUEDIR=%2
IF NOT DEFINED TORQUEDIR SET TORQUEDIR=..\..
@%TORQUEDIR%\engine\bin\php\php %TORQUEDIR%\Tools\projectGenerator\projectGenerator.php buildFiles/config/libs.conf %TORQUEDIR%
@echo ...
@echo ...
@echo ...
@echo REMEMBER: Restart Visual Studio if you are running it to be sure the new
@echo project file(s) are loaded! See docs for more info!
@IF X%1 == X pause