mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-10 22:24:33 +00:00
VCPKG Full refactor
uses local cache for assets now so should be able to produce an offline build with vcpkg. Only a couple of libraries left that are too big, and the vcpkg repo itself has files that are blocked from the repo. We could get around both issues by utilizing a submodule
This commit is contained in:
parent
0b73e701ac
commit
392df11e2b
9683 changed files with 284 additions and 3462845 deletions
|
|
@ -14,6 +14,12 @@ find_package(FLAC CONFIG REQUIRED)
|
|||
find_package(Opus CONFIG REQUIRED)
|
||||
find_package(unofficial-theora CONFIG REQUIRED)
|
||||
find_package(SndFile CONFIG REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
find_package(SDL2 CONFIG REQUIRED)
|
||||
find_package(unofficial-pcre CONFIG REQUIRED)
|
||||
find_package(tinyxml2 CONFIG REQUIRED)
|
||||
find_package(unofficial-libsquish CONFIG REQUIRED)
|
||||
set(TORQUE_LINK_THIRDPARTY ${TORQUE_LINK_THIRDPARTY}
|
||||
Ogg::ogg
|
||||
Vorbis::vorbis
|
||||
|
|
@ -22,7 +28,23 @@ set(TORQUE_LINK_THIRDPARTY ${TORQUE_LINK_THIRDPARTY}
|
|||
Opus::opus
|
||||
unofficial::theora::theora unofficial::theora::theoradec unofficial::theora::theoraenc
|
||||
SndFile::sndfile
|
||||
ZLIB::ZLIB
|
||||
PNG::PNG
|
||||
$<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
|
||||
$<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
|
||||
unofficial::pcre::pcre unofficial::pcre::pcre16 unofficial::pcre::pcre32 unofficial::pcre::pcrecpp
|
||||
tinyxml2::tinyxml2
|
||||
unofficial::libsquish::squish
|
||||
)
|
||||
|
||||
if(TORQUE_TESTING)
|
||||
find_package(GTest CONFIG REQUIRED)
|
||||
set(TORQUE_LINK_THIRDPARTY ${TORQUE_LINK_THIRDPARTY}
|
||||
GTest::gtest GTest::gmock
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
################# Helper Function Calls ###################
|
||||
forwardDef(TORQUE_OPENGL)
|
||||
forwardDef(TORQUE_D3D11)
|
||||
|
|
@ -786,8 +808,6 @@ target_include_directories(${TORQUE_APP_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR
|
|||
if(TORQUE_TESTING)
|
||||
if(WIN32)
|
||||
target_link_options(${TORQUE_APP_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
|
||||
set_target_properties(gtest PROPERTIES COMPILE_FLAGS "/Zc:wchar_t-")
|
||||
set_target_properties(gmock PROPERTIES COMPILE_FLAGS "/Zc:wchar_t-")
|
||||
endif()
|
||||
endif(TORQUE_TESTING)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#include "tinyxml2/tinyxml2.h"
|
||||
#include <tinyxml2.h>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Console implementation of STL map.
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "gfx/bitmap/imageUtils.h"
|
||||
#include "gfx/bitmap/ddsFile.h"
|
||||
#include "platform/threads/threadPool.h"
|
||||
#include "squish/squish.h"
|
||||
#include <squish.h>
|
||||
|
||||
namespace ImageUtil
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
|
||||
#define PNG_INTERNAL 1
|
||||
#include <time.h>
|
||||
#include "lpng/png.h"
|
||||
#include "zlib/zlib.h"
|
||||
#include <png.h>
|
||||
#include <zlib.h>
|
||||
|
||||
#ifdef NULL
|
||||
#undef NULL
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include "console/console.h"
|
||||
#include "console/engineAPI.h"
|
||||
#include "platform/threads/mutex.h"
|
||||
#include "zlib/zlib.h"
|
||||
#include <zlib.h>
|
||||
|
||||
|
||||
GFX_ImplementTextureProfile(GFXFontTextureProfile,
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
|
||||
#ifndef TINYXML_INCLUDED
|
||||
#include "tinyxml2/tinyxml2.h"
|
||||
#include <tinyxml2.h>
|
||||
#endif
|
||||
|
||||
#include "platform/platform.h"
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@
|
|||
#include "collision/vertexPolyList.h"
|
||||
#include "platform/profiler.h"
|
||||
|
||||
#include "opcode/Opcode.h"
|
||||
#include "opcode/Ice/IceAABB.h"
|
||||
#include "opcode/Ice/IcePoint.h"
|
||||
#include "opcode/OPC_AABBTree.h"
|
||||
#include "opcode/OPC_AABBCollider.h"
|
||||
#include <Opcode.h>
|
||||
#include <Ice/IceAABB.h>
|
||||
#include <Ice/IcePoint.h>
|
||||
#include <OPC_AABBTree.h>
|
||||
#include <OPC_AABBCollider.h>
|
||||
|
||||
static bool gOpcodeInitialized = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
#include "gfx/util/triListOpt.h"
|
||||
#include "util/triRayCheck.h"
|
||||
|
||||
#include "opcode/Opcode.h"
|
||||
#include <Opcode.h>
|
||||
|
||||
GFXPrimitiveType drawTypes[] = { GFXTriangleList, GFXTriangleStrip };
|
||||
#define getDrawType(a) (drawTypes[a])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue