AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-08-11 23:39:06 +00:00
Code Issues Projects Releases Wiki Activity

remove 'mp1' target in favor of library entry

Browse Source
This commit is contained in:
Jack Andersen 2016-03-03 19:28:20 -10:00
parent 74ce228060
commit 8c9eca1858
5 changed files with 21 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DataSpec/DNACommon/CMDL.cpp
View File

@ -123,6 +123,13 @@ void ReadMaterialSetToBlender_3(HECL::BlenderConnection::PyOutStream& os,
} }
} }
template void ReadMaterialSetToBlender_3<PAKRouter<DNAMP3::PAKBridge>, DNAMP3::MaterialSet>
(HECL::BlenderConnection::PyOutStream& os,
const DNAMP3::MaterialSet& matSet,
const PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
unsigned setIdx);
class DLReader class DLReader
{ {
public: public:

2
Runtime/MP1/CMainFlow.cpp
View File

@ -1,7 +1,7 @@
#include "CMainFlow.hpp" #include "CMainFlow.hpp"
#include "MP1.hpp"
#include "CArchitectureQueue.hpp" #include "CArchitectureQueue.hpp"
#include "CMFGame.hpp" #include "CMFGame.hpp"
#include "CMain.hpp"
#include "CPlayMovie.hpp" #include "CPlayMovie.hpp"
#include "CResFactory.hpp" #include "CResFactory.hpp"
#include "CFrontEndUI.hpp" #include "CFrontEndUI.hpp"

29
Runtime/MP1/CMakeLists.txt
View File

@ -1,22 +1,9 @@
include_directories(. ..) include_directories(. ..)
add_executable(mp1 add_library(RuntimeMP1
CTweaks.hpp CTweaks.cpp CTweaks.hpp CTweaks.cpp
CInGameTweakManager.hpp CInGameTweakManager.cpp CInGameTweakManager.hpp CInGameTweakManager.cpp
CMainFlow.hpp CMainFlow.cpp CMainFlow.hpp CMainFlow.cpp
CMFGame.hpp CMFGame.cpp CMFGame.hpp CMFGame.cpp
CPlayMovie.hpp CPlayMovie.cpp CPlayMovie.hpp CPlayMovie.cpp
CFrontEndUI.hpp CFrontEndUI.cpp CFrontEndUI.hpp CFrontEndUI.cpp
CMain.hpp MP1.hpp MP1.cpp)
main.cpp)
target_link_libraries(mp1
RuntimeCommonCharacter
RuntimeCommonInput
RuntimeCommonParticle
RuntimeCommonGraphics
RuntimeCommon
DNAMP1
DNACommon
HECLDatabase HECLBlender HECLCommon AthenaCore NOD
LogVisor AthenaLibYaml Boo ${PNG_LIB} squish xxhash Math
${ZLIB_LIBRARIES} ${LZO_LIB}
${BOO_SYS_LIBS})

21
Runtime/MP1/main.cpp → Runtime/MP1/MP1.cpp
View File

@ -31,7 +31,7 @@
#include "Audio/CAudioStateWin.hpp" #include "Audio/CAudioStateWin.hpp"
#include "GameGlobalObjects.hpp" #include "GameGlobalObjects.hpp"
#include "CArchitectureQueue.hpp" #include "CArchitectureQueue.hpp"
#include "CMain.hpp" #include "MP1.hpp"
#include "CTimeProvider.hpp" #include "CTimeProvider.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp"
@ -265,22 +265,3 @@ int CMain::appMain(boo::IApplication* app)
} }
} }
#ifdef _WIN32
int wmain(int argc, const wchar_t* argv[])
#else
int main(int argc, const char* argv[])
#endif
{
#if _WIN32
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
#else
std::setlocale(LC_ALL, "en-US.UTF-8");
#endif
LogVisor::RegisterConsoleLogger();
pshag::TOneStatic<pshag::MP1::CMain> main;
int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, *main,
_S("mp1"), _S("MP1"), argc, argv);
return ret;
}

8
Runtime/MP1/CMain.hpp → Runtime/MP1/MP1.hpp
View File

@ -1,5 +1,5 @@
#ifndef __PSHAG_CMAIN_HPP__ #ifndef __PSHAG_MP1_HPP__
#define __PSHAG_CMAIN_HPP__ #define __PSHAG_MP1_HPP__
#include <boo/boo.hpp> #include <boo/boo.hpp>
#include "CMemory.hpp" #include "CMemory.hpp"
@ -27,7 +27,7 @@ class WindowCallback : public boo::IWindowCallback
}; };
class CMain : public boo::IApplicationCallback class CMain : public boo::IApplicationCallback
{ {
boo::IWindow* mainWindow; boo::IWindow* mainWindow;
int appMain(boo::IApplication* app); int appMain(boo::IApplication* app);
void appQuitting(boo::IApplication*) void appQuitting(boo::IApplication*)
@ -69,4 +69,4 @@ extern CMain* g_main;
} }
} }
#endif // __PSHAG_CMAIN_HPP__ #endif // __PSHAG_MP1_HPP__