mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge remote-tracking branch 'gg/development' into gtest-tests
This commit is contained in:
commit
5a430af051
|
|
@ -1589,6 +1589,13 @@ DefineEngineFunction( displaySplashWindow, bool, (const char* path), ("art/gui/s
|
|||
return Platform::displaySplashWindow(path);
|
||||
}
|
||||
|
||||
DefineEngineFunction( closeSplashWindow, void, (),,
|
||||
"Close our startup splash window.\n\n"
|
||||
"@note This is currently only implemented on Windows.\n\n"
|
||||
"@ingroup Platform" )
|
||||
{
|
||||
Platform::closeSplashWindow();
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
DefineEngineFunction( getWebDeployment, bool, (),,
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ public:
|
|||
static const U32 getListIndex(){ return mListIndex; }
|
||||
|
||||
virtual void *getMemInstPtr() = 0;
|
||||
virtual const void *getConstMemInstPtr() const = 0;
|
||||
virtual const dsize_t getMemInstSize() const = 0;
|
||||
|
||||
#ifdef TORQUE_ENABLE_THREAD_STATIC_METRICS
|
||||
|
|
@ -143,6 +144,7 @@ private:
|
|||
public:
|
||||
TorqueThreadStatic( T instanceVal ) : mInstance( instanceVal ) {}
|
||||
virtual void *getMemInstPtr() { return &mInstance; }
|
||||
virtual const void *getConstMemInstPtr() const { return &mInstance; }
|
||||
|
||||
// I am not sure these are needed, and I don't want to create confusing-to-debug code
|
||||
#if 0
|
||||
|
|
@ -181,7 +183,7 @@ public: \
|
|||
_##name##TorqueThreadStatic() : TorqueThreadStatic<type>( initalvalue ) {} \
|
||||
virtual const dsize_t getMemInstSize() const { return sizeof( type ); } \
|
||||
type &_cast() { return *reinterpret_cast<type *>( getMemInstPtr() ); } \
|
||||
const type &_const_cast() const { return *reinterpret_cast<const type *>( getMemInstPtr() ); } \
|
||||
const type &_const_cast() const { return *reinterpret_cast<const type *>( getConstMemInstPtr() ); } \
|
||||
}; \
|
||||
static _##name##TorqueThreadStatic name##TorqueThreadStatic; \
|
||||
static _TorqueThreadStaticReg _##name##TTSReg( reinterpret_cast<_TorqueThreadStatic *>( & name##TorqueThreadStatic ) )
|
||||
|
|
|
|||
|
|
@ -732,6 +732,11 @@ void WaterObject::renderObject( ObjectRenderInst *ri, SceneRenderState *state, B
|
|||
|
||||
bool doQuery = ( !mPlaneReflector.mQueryPending && query && mReflectorDesc.useOcclusionQuery );
|
||||
|
||||
// We need to call this for avoid a DX9 or Nvidia bug.
|
||||
// At some resollutions read from render target,
|
||||
// break current occlusion query.
|
||||
REFLECTMGR->getRefractTex();
|
||||
|
||||
if ( doQuery )
|
||||
query->begin();
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,8 @@ GuiCanvas::GuiCanvas(): GuiControl(),
|
|||
mMiddleMouseLast(false),
|
||||
mRightMouseLast(false),
|
||||
mPlatformWindow(NULL),
|
||||
mLastRenderMs(0)
|
||||
mLastRenderMs(0),
|
||||
mDisplayWindow(true)
|
||||
{
|
||||
setBounds(0, 0, 640, 480);
|
||||
mAwake = true;
|
||||
|
|
@ -176,6 +177,8 @@ void GuiCanvas::initPersistFields()
|
|||
|
||||
addGroup("Canvas Rendering");
|
||||
addProtectedField( "numFences", TypeS32, Offset( mNumFences, GuiCanvas ), &setProtectedNumFences, &defaultProtectedGetFn, "The number of GFX fences to use." );
|
||||
|
||||
addField("displayWindow", TypeBool, Offset(mDisplayWindow, GuiCanvas), "Controls if the canvas window is rendered or not." );
|
||||
endGroup("Canvas Rendering");
|
||||
|
||||
Parent::initPersistFields();
|
||||
|
|
@ -252,6 +255,19 @@ bool GuiCanvas::onAdd()
|
|||
// Make sure we're able to render.
|
||||
newDevice->setAllowRender( true );
|
||||
|
||||
if(mDisplayWindow)
|
||||
{
|
||||
getPlatformWindow()->show();
|
||||
WindowManager->setDisplayWindow(true);
|
||||
getPlatformWindow()->setDisplayWindow(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
getPlatformWindow()->hide();
|
||||
WindowManager->setDisplayWindow(false);
|
||||
getPlatformWindow()->setDisplayWindow(false);
|
||||
}
|
||||
|
||||
// Propagate add to parents.
|
||||
// CodeReview - if GuiCanvas fails to add for whatever reason, what happens to
|
||||
// all the event registration above?
|
||||
|
|
@ -2683,3 +2699,23 @@ ConsoleMethod( GuiCanvas, setVideoMode, void, 5, 8,
|
|||
// Store the new mode into a pref.
|
||||
Con::setVariable( "$pref::Video::mode", vm.toString() );
|
||||
}
|
||||
|
||||
ConsoleMethod( GuiCanvas, showWindow, void, 2, 2, "" )
|
||||
{
|
||||
if (!object->getPlatformWindow())
|
||||
return;
|
||||
|
||||
object->getPlatformWindow()->show();
|
||||
WindowManager->setDisplayWindow(true);
|
||||
object->getPlatformWindow()->setDisplayWindow(true);
|
||||
}
|
||||
|
||||
ConsoleMethod( GuiCanvas, hideWindow, void, 2, 2, "" )
|
||||
{
|
||||
if (!object->getPlatformWindow())
|
||||
return;
|
||||
|
||||
object->getPlatformWindow()->hide();
|
||||
WindowManager->setDisplayWindow(false);
|
||||
object->getPlatformWindow()->setDisplayWindow(false);
|
||||
}
|
||||
|
|
@ -108,6 +108,8 @@ protected:
|
|||
bool mClampTorqueCursor;
|
||||
bool mAlwaysHandleMouseButtons;
|
||||
|
||||
bool mDisplayWindow;
|
||||
|
||||
/// @}
|
||||
|
||||
/// @name Mouse Input
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdL
|
|||
HMODULE hGame = NULL;
|
||||
std::wstring dllName = std::wstring();
|
||||
// The file name is the same as this executable's name, plus a suffix.
|
||||
const std::wstring dllSuffices[] = {L"", L" DLL"};
|
||||
const std::wstring dllSuffices[] = {L" DLL", L""};
|
||||
const unsigned int numSuffices = sizeof(dllSuffices) / sizeof(std::wstring);
|
||||
|
||||
for (unsigned int i = 0; i < numSuffices; i++)
|
||||
|
|
|
|||
|
|
@ -338,6 +338,9 @@ namespace Platform
|
|||
// display Splash Window
|
||||
bool displaySplashWindow( String path );
|
||||
|
||||
// close Splash Window
|
||||
bool closeSplashWindow();
|
||||
|
||||
void openFolder( const char* path );
|
||||
|
||||
// Open file at the OS level, according to registered file-types.
|
||||
|
|
|
|||
|
|
@ -118,9 +118,6 @@ public:
|
|||
|
||||
static U8 getModifierKeys() {return smModifierKeys;}
|
||||
static void setModifierKeys(U8 mod) {smModifierKeys = mod;}
|
||||
|
||||
static void attemptSwitchToKeyboardLayout( U32 layout );
|
||||
|
||||
#ifdef LOG_INPUT
|
||||
static void log( const char* format, ... );
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -70,6 +70,11 @@ bool Platform::displaySplashWindow()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool Platform::closeSplashWindow()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma mark ---- File IO ----
|
||||
//-----------------------------------------------------------------------------
|
||||
bool dPathCopy(const char* source, const char* dest, bool nooverwrite)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,6 @@
|
|||
#include <stdarg.h>
|
||||
#endif
|
||||
|
||||
#include <sstream>
|
||||
|
||||
// Static class variables:
|
||||
InputManager* Input::smManager;
|
||||
bool Input::smActive;
|
||||
|
|
@ -81,10 +79,6 @@ void Input::init()
|
|||
|
||||
destroy();
|
||||
|
||||
#ifdef TORQUE_DEFAULT_KEYBOARD_LAYOUT
|
||||
attemptSwitchToKeyboardLayout( TORQUE_DEFAULT_KEYBOARD_LAYOUT );
|
||||
#endif
|
||||
|
||||
#ifdef LOG_INPUT
|
||||
struct tm* newTime;
|
||||
time_t aclock;
|
||||
|
|
@ -493,18 +487,6 @@ InputManager* Input::getManager()
|
|||
return( smManager );
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void Input::attemptSwitchToKeyboardLayout( U32 layout )
|
||||
{
|
||||
const LANGID lang = MAKELANGID( layout, SUBLANG_DEFAULT );
|
||||
std::wstringstream ss;
|
||||
ss << std::hex << lang;
|
||||
const wchar_t* hexLang = ss.str().c_str();
|
||||
ActivateKeyboardLayout( LoadKeyboardLayout(
|
||||
hexLang, KLF_ACTIVATE | KLF_REPLACELANG
|
||||
), KLF_REORDER );
|
||||
}
|
||||
|
||||
#ifdef LOG_INPUT
|
||||
//------------------------------------------------------------------------------
|
||||
void Input::log( const char* format, ... )
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ void Platform::openFile(const char *path) { }
|
|||
|
||||
// window
|
||||
bool Platform::displaySplashWindow(String path) { return false; }
|
||||
bool Platform::closeSplashWindow() { return false; }
|
||||
|
||||
// font
|
||||
PlatformFont *createPlatformFont(const char *name, U32 size, U32 charset) { return NULL; }
|
||||
|
|
|
|||
|
|
@ -458,12 +458,8 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor*
|
|||
}
|
||||
|
||||
// Now we need to map the key string to the proper KEY code from event.h
|
||||
AssertFatal(
|
||||
dStrlen( pObjectString ) > 0,
|
||||
"Error, no key was specified!\n"
|
||||
"Review file 'scripts/client/config.cs' and remove symbols"
|
||||
" which is not latin. Or delete this file."
|
||||
);
|
||||
//
|
||||
AssertFatal(dStrlen(pObjectString) != 0, "Error, no key was specified!");
|
||||
|
||||
if (dStrlen(pObjectString) == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ protected:
|
|||
/// Offscreen Render
|
||||
bool mOffscreenRender;
|
||||
|
||||
/// This is set as part of the canvas being shown, and flags that the windows should render as normal from now on.
|
||||
// Basically a flag that lets the window manager know that we've handled the splash screen, and to operate as normal.
|
||||
bool mDisplayWindow;
|
||||
|
||||
/// Protected constructor so that the win
|
||||
PlatformWindow()
|
||||
{
|
||||
|
|
@ -104,6 +108,7 @@ protected:
|
|||
mSuppressReset = false;
|
||||
|
||||
mOffscreenRender = false;
|
||||
mDisplayWindow = false;
|
||||
}
|
||||
|
||||
public:
|
||||
|
|
@ -180,6 +185,8 @@ public:
|
|||
/// This is called to poll the window as to it's idle state.
|
||||
virtual bool getOffscreenRender() { return mOffscreenRender; };
|
||||
|
||||
/// Set whether this window is should display as normal
|
||||
virtual void setDisplayWindow(bool val ) { mDisplayWindow = val; };
|
||||
|
||||
/// Set Focused State (Foreground)
|
||||
///
|
||||
|
|
|
|||
|
|
@ -133,6 +133,9 @@ public:
|
|||
/// This method removes the curtain window.
|
||||
virtual void raiseCurtain()=0;
|
||||
|
||||
/// This method indicates to created windows to show as normal.
|
||||
virtual void setDisplayWindow(bool set){}
|
||||
|
||||
private:
|
||||
/// Process command line arguments from StandardMainLoop. This is done to
|
||||
/// allow web plugin functionality, where we are passed platform-specific
|
||||
|
|
|
|||
|
|
@ -121,6 +121,13 @@ void CloseSplashWindow(HINSTANCE hinst)
|
|||
|
||||
}
|
||||
|
||||
bool Platform::closeSplashWindow()
|
||||
{
|
||||
CloseSplashWindow(GetModuleHandle(NULL));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Platform::displaySplashWindow( String path )
|
||||
{
|
||||
if(path.isEmpty())
|
||||
|
|
|
|||
|
|
@ -153,7 +153,9 @@ void Win32Window::setVideoMode( const GFXVideoMode &mode )
|
|||
{
|
||||
SetWindowLong( getHWND(), GWL_STYLE, WS_POPUP);
|
||||
SetWindowPos( getHWND(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
|
||||
ShowWindow(getHWND(), SW_SHOWNORMAL);
|
||||
|
||||
if(mDisplayWindow)
|
||||
ShowWindow(getHWND(), SW_SHOWNORMAL);
|
||||
|
||||
// Clear the menu bar from the window for full screen
|
||||
HMENU menu = GetMenu(getHWND());
|
||||
|
|
@ -216,7 +218,9 @@ void Win32Window::setVideoMode( const GFXVideoMode &mode )
|
|||
// We have to force Win32 to update the window frame and make the window
|
||||
// visible and no longer topmost - this code might be possible to simplify.
|
||||
SetWindowPos( getHWND(), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
|
||||
ShowWindow( getHWND(), SW_SHOWNORMAL);
|
||||
|
||||
if(mDisplayWindow)
|
||||
ShowWindow( getHWND(), SW_SHOWNORMAL);
|
||||
}
|
||||
|
||||
mFullscreen = false;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ Win32WindowManager::Win32WindowManager()
|
|||
|
||||
mOffscreenRender = false;
|
||||
|
||||
mDisplayWindow = false;
|
||||
|
||||
buildMonitorsList();
|
||||
}
|
||||
|
||||
|
|
@ -263,11 +265,13 @@ PlatformWindow *Win32WindowManager::createWindow(GFXDevice *device, const GFXVid
|
|||
|
||||
// If we're not rendering offscreen, make sure our window is shown and drawn to.
|
||||
|
||||
if (!mOffscreenRender)
|
||||
ShowWindow( w32w->mWindowHandle, SW_SHOWDEFAULT );
|
||||
w32w->setDisplayWindow(mDisplayWindow);
|
||||
|
||||
// Close any splash screen we created
|
||||
CloseSplashWindow(winState.appInstance);
|
||||
if (!mOffscreenRender && mDisplayWindow)
|
||||
{
|
||||
ShowWindow( w32w->mWindowHandle, SW_SHOWDEFAULT );
|
||||
CloseSplashWindow(winState.appInstance);
|
||||
}
|
||||
|
||||
// Bind the window to the specified device.
|
||||
if(device)
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ class Win32WindowManager : public PlatformWindowManager
|
|||
// is intended for offscreen rendering
|
||||
bool mOffscreenRender;
|
||||
|
||||
/// This is set as part of the canvas being shown, and flags that the windows should render as normal from now on.
|
||||
// Basically a flag that lets the window manager know that we've handled the splash screen, and to operate as normal.
|
||||
bool mDisplayWindow;
|
||||
|
||||
/// Internal structure used when enumerating monitors
|
||||
struct MonitorInfo {
|
||||
HMONITOR monitorHandle;
|
||||
|
|
@ -117,6 +121,8 @@ public:
|
|||
|
||||
virtual void lowerCurtain();
|
||||
virtual void raiseCurtain();
|
||||
|
||||
virtual void setDisplayWindow(bool set) { mDisplayWindow = set; }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
|
|
@ -148,13 +148,6 @@
|
|||
/// texture manager.
|
||||
#define TORQUE_FRAME_SIZE 16 << 20
|
||||
|
||||
// Default keyboard layout for launching the game. It's fixed crash when a
|
||||
// game running with the extend unicode keyboard (cyrillic, for example).
|
||||
// Windows only.
|
||||
// @see For choice language >
|
||||
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
|
||||
#define TORQUE_DEFAULT_KEYBOARD_LAYOUT LANG_ENGLISH
|
||||
|
||||
// Finally, we define some dependent #defines. This enables some subsidiary
|
||||
// functionality to get automatically turned on in certain configurations.
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ function createCanvas(%windowTitle)
|
|||
}
|
||||
|
||||
// Create the Canvas
|
||||
%foo = new GuiCanvas(Canvas);
|
||||
%foo = new GuiCanvas(Canvas)
|
||||
{
|
||||
displayWindow = false;
|
||||
};
|
||||
|
||||
// Set the window title
|
||||
if (isObject(Canvas))
|
||||
|
|
@ -246,6 +249,15 @@ if ($displayHelp) {
|
|||
else {
|
||||
onStart();
|
||||
echo("Engine initialized...");
|
||||
|
||||
if( !$isDedicated )
|
||||
{
|
||||
// As we know at this point that the initial load is complete,
|
||||
// we can hide any splash screen we have, and show the canvas.
|
||||
// This keeps things looking nice, instead of having a blank window
|
||||
closeSplashWindow();
|
||||
Canvas.showWindow();
|
||||
}
|
||||
|
||||
// Auto-load on the 360
|
||||
if( $platform $= "xenon" )
|
||||
|
|
|
|||
|
|
@ -169,13 +169,6 @@
|
|||
/// texture manager.
|
||||
#define TORQUE_FRAME_SIZE 16 << 20
|
||||
|
||||
// Default keyboard layout for launching the game. It's fixed crash when a
|
||||
// game running with the extend unicode keyboard (cyrillic, for example).
|
||||
// Windows only.
|
||||
// @see For choice language >
|
||||
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
|
||||
#define TORQUE_DEFAULT_KEYBOARD_LAYOUT LANG_ENGLISH
|
||||
|
||||
// Finally, we define some dependent #defines. This enables some subsidiary
|
||||
// functionality to get automatically turned on in certain configurations.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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(basics.cmake)
|
||||
|
||||
setupVersionNumbers()
|
||||
|
|
|
|||
|
|
@ -1,15 +1,38 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project("Torque3DEngine")
|
||||
|
||||
set(TORQUE_TEMPLATE "Full" CACHE STRING "the template to use")
|
||||
|
||||
if(NOT projectDir)
|
||||
set(projectDir "${CMAKE_SOURCE_DIR}/My Projects/${TORQUE_APP_NAME}")
|
||||
if(NOT TORQUE_TEMPLATE)
|
||||
set(TORQUE_TEMPLATE "Full" CACHE STRING "the template to use")
|
||||
endif()
|
||||
if(NOT TORQUE_APP_DIR)
|
||||
set(TORQUE_APP_DIR "${CMAKE_SOURCE_DIR}/My Projects/${TORQUE_APP_NAME}")
|
||||
endif()
|
||||
if(NOT projectOutDir)
|
||||
set(projectOutDir "${projectDir}/game")
|
||||
set(projectOutDir "${TORQUE_APP_DIR}/game")
|
||||
endif()
|
||||
if(NOT projectSrcDir)
|
||||
set(projectSrcDir "${projectDir}/source")
|
||||
set(projectSrcDir "${TORQUE_APP_DIR}/source")
|
||||
endif()
|
||||
set(libDir "${CMAKE_SOURCE_DIR}/Engine/lib")
|
||||
set(srcDir "${CMAKE_SOURCE_DIR}/Engine/source")
|
||||
|
|
@ -295,7 +318,7 @@ macro(setupPackaging)
|
|||
SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
|
||||
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
|
||||
SET(CPACK_OUTPUT_FILE_PREFIX "${projectDir}/packages/${PROJECT_NAME}")
|
||||
SET(CPACK_OUTPUT_FILE_PREFIX "${TORQUE_APP_DIR}/packages/${PROJECT_NAME}")
|
||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "")
|
||||
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
|
||||
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(collada)
|
||||
|
||||
addPath("${libDir}/collada/src/1.4/dom")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(convexDecomp)
|
||||
|
||||
if(UNIX)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(libogg)
|
||||
|
||||
addPath("${libDir}/libogg" REC)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(libtheora)
|
||||
|
||||
addPath( "${libDir}/libtheora" )
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(libvorbis)
|
||||
|
||||
addPathRec("${libDir}/libvorbis")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(ljpeg)
|
||||
|
||||
finishLibrary("${libDir}/ljpeg")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(lmng)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(lpng)
|
||||
|
||||
# addDef(PNG_NO_ASSEMBLER_CODE)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(lungif)
|
||||
|
||||
addDef(_GBA_NO_FILEIO)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(opcode)
|
||||
|
||||
addPath("${libDir}/${PROJECT_NAME}")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(pcre)
|
||||
|
||||
addDef(PCRE_STATIC)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Recast library
|
||||
project(recast)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(squish)
|
||||
|
||||
finishLibrary("${libDir}/${PROJECT_NAME}")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(tinyxml)
|
||||
|
||||
finishLibrary("${libDir}/${PROJECT_NAME}")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(zlib)
|
||||
|
||||
finishLibrary("${libDir}/${PROJECT_NAME}")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# module OculusVR
|
||||
|
||||
# Source
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Navigation module
|
||||
|
||||
addDef( "TORQUE_NAVIGATION_ENABLED" )
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# module OculusVR
|
||||
|
||||
# Source
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
option(TORQUE_TESTS_ENABLED "TORQUE_TESTS_ENABLED" OFF)
|
||||
|
||||
if(TORQUE_TESTS_ENABLED)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# this is a template file that should help you write a new cmake build script for a new library
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,25 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
project(${TORQUE_APP_NAME})
|
||||
|
||||
if(UNIX)
|
||||
|
|
@ -553,11 +575,11 @@ endif()
|
|||
|
||||
if(TORQUE_TEMPLATE)
|
||||
message("Prepare Template(${TORQUE_TEMPLATE}) install...")
|
||||
INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game" DESTINATION "${projectDir}")
|
||||
INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game" DESTINATION "${TORQUE_APP_DIR}")
|
||||
if(WIN32)
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/cleanShaders.bat" DESTINATION "${projectDir}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteCachedDTSs.bat" DESTINATION "${projectDir}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteDSOs.bat" DESTINATION "${projectDir}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeletePrefs.bat" DESTINATION "${projectDir}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/cleanShaders.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteCachedDTSs.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteDSOs.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeletePrefs.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Reference in a new issue