sean-m
/
lithtech
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename binaries

pull/5/head
bibendovsky 2017-10-01 20:36:12 +03:00
parent dd5c70bc92
commit 1e4bd00b85
16 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/runtime/info/src/sys/win32/outputredir_win32.cpp
View File

@ -85,7 +85,7 @@ void COutputRedir::OutputToASSERT()
#ifndef __MINGW32__
//_assert(m_pPrintBuffer, __FILE__, __LINE__);
_CrtDbgReport(_CRT_ASSERT, NULL, 0, "server.dll", "%s", m_pPrintBuffer);
_CrtDbgReport(_CRT_ASSERT, NULL, 0, "ltjs_server.dll", "%s", m_pPrintBuffer);
#else
ASSERT(!m_pPrintBuffer);
#endif

2
engine/runtime/kernel/src/sys/win/client.cpp
View File

@ -534,7 +534,7 @@ int RunClientApp(HINSTANCE hInstance) {
status = dsi_Init();
if (status != 0) {
if (status == 1) {
MessageBox(LTNULL, "Unable to load ltmsg.dll.", "Error", MB_OK);
MessageBox(LTNULL, "Unable to load ltjs_ltmsg.dll.", "Error", MB_OK);
dsi_Term();
return -1;
}

55
engine/runtime/kernel/src/sys/win/dsys_interface.cpp
View File

@ -114,7 +114,7 @@ LTSysResultString g_StringMap[] = {
// --------------------------------------------------------------- //
static LTBOOL dsi_LoadResourceModule() {
g_hResourceModule = LoadLibrary("ltmsg.dll");
g_hResourceModule = LoadLibrary("ltjs_ltmsg.dll");
#if 0
#ifdef LITHTECH_ESD
@ -297,16 +297,15 @@ LTRESULT dsi_LoadServerObjects(CClassMgr *pClassMgr)
{
char fileName[256];
int status;
char *pDLLName;
pDLLName = "object.lto";
constexpr auto object_file_name = "ltjs_object.dll";
//Copy the object.lto file out of the res so we can run it.
bool bFileCopied = false;
if (GetOrCopyFile( pDLLName, fileName, sizeof(fileName), bFileCopied) != LT_OK)
if (GetOrCopyFile( object_file_name, fileName, sizeof(fileName), bFileCopied) != LT_OK)
{
sm_SetupError(LT_ERRORCOPYINGFILE, pDLLName);
RETURN_ERROR_PARAM(1, LoadServerObjects, LT_ERRORCOPYINGFILE, pDLLName);
sm_SetupError(LT_ERRORCOPYINGFILE, object_file_name);
RETURN_ERROR_PARAM(1, LoadServerObjects, LT_ERRORCOPYINGFILE, object_file_name);
}
//load the object.lto DLL.
@ -315,27 +314,29 @@ LTRESULT dsi_LoadServerObjects(CClassMgr *pClassMgr)
//check for errors.
if (status == CB_CANTFINDMODULE) {
sm_SetupError(LT_INVALIDOBJECTDLL, pDLLName);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLL, pDLLName);
sm_SetupError(LT_INVALIDOBJECTDLL, object_file_name);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLL, object_file_name);
}
else if (status == CB_NOTCLASSMODULE) {
sm_SetupError(LT_INVALIDOBJECTDLL, pDLLName);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLL, pDLLName);
sm_SetupError(LT_INVALIDOBJECTDLL, object_file_name);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLL, object_file_name);
}
else if (status == CB_VERSIONMISMATCH) {
sm_SetupError(LT_INVALIDOBJECTDLLVERSION, pDLLName, version, SERVEROBJ_VERSION);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLLVERSION, pDLLName);
sm_SetupError(LT_INVALIDOBJECTDLLVERSION, object_file_name, version, SERVEROBJ_VERSION);
RETURN_ERROR_PARAM(1, LoadObjectsInDirectory, LT_INVALIDOBJECTDLLVERSION, object_file_name);
}
// Get sres.dll.
constexpr auto sres_file_name = "ltjs_sres.dll";
bFileCopied = false;
if ((GetOrCopyFile("sres.dll", fileName, sizeof(fileName),bFileCopied) != LT_OK)
if ((GetOrCopyFile(sres_file_name, fileName, sizeof(fileName),bFileCopied) != LT_OK)
|| (bm_BindModule(fileName, bFileCopied, pClassMgr->m_hServerResourceModule) != BIND_NOERROR))
{
cb_UnloadModule( pClassMgr->m_ClassModule );
sm_SetupError(LT_ERRORCOPYINGFILE, "sres.dll");
RETURN_ERROR_PARAM(1, LoadServerObjects, LT_ERRORCOPYINGFILE, "sres.dll");
sm_SetupError(LT_ERRORCOPYINGFILE, sres_file_name);
RETURN_ERROR_PARAM(1, LoadServerObjects, LT_ERRORCOPYINGFILE, sres_file_name);
}
//let the dll know it's instance handle.
@ -512,11 +513,13 @@ LTRESULT dsi_InitClientShellDE()
g_pClientMgr->m_hShellModule = LTNULL;
// Setup the cshell.dll file.
constexpr auto cshell_file_name = "ltjs_cshell.dll";
bool bFileCopied = false;
dResult = GetOrCopyClientFile( "cshell.dll", fileName, sizeof(fileName), bFileCopied );
dResult = GetOrCopyClientFile( cshell_file_name, fileName, sizeof(fileName), bFileCopied );
if (dResult != LT_OK) {
g_pClientMgr->SetupError(LT_ERRORCOPYINGFILE, "cshell.dll");
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_ERRORCOPYINGFILE, "cshell.dll");
g_pClientMgr->SetupError(LT_ERRORCOPYINGFILE, cshell_file_name);
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_ERRORCOPYINGFILE, cshell_file_name);
}
//load the DLL.
@ -524,27 +527,29 @@ LTRESULT dsi_InitClientShellDE()
//check if it loaded correctly.
if (status == BIND_CANTFINDMODULE) {
g_pClientMgr->SetupError(LT_MISSINGSHELLDLL, "cshell.dll");
g_pClientMgr->SetupError(LT_MISSINGSHELLDLL, cshell_file_name);
RETURN_ERROR(1, InitClientShellDE, LT_MISSINGSHELLDLL);
}
//check if we now have the IClientShell interface instantiated.
if (i_client_shell == NULL) {
g_pClientMgr->SetupError(LT_INVALIDSHELLDLL, "cshell.dll");
g_pClientMgr->SetupError(LT_INVALIDSHELLDLL, cshell_file_name);
RETURN_ERROR(1, InitClientShellDE, LT_INVALIDSHELLDLL);
}
//
// Try to setup cres.dll.
//
constexpr auto cres_file_name = "ltjs_cres.dll";
//copy the file out of the res file.
bFileCopied = false;
dResult = GetOrCopyClientFile( "cres.dll", fileName, sizeof(fileName), bFileCopied );
dResult = GetOrCopyClientFile( cres_file_name, fileName, sizeof(fileName), bFileCopied );
if (dResult != LT_OK)
{
g_pClientMgr->SetupError(LT_ERRORCOPYINGFILE, "cres.dll");
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_ERRORCOPYINGFILE, "cres.dll");
g_pClientMgr->SetupError(LT_ERRORCOPYINGFILE, cres_file_name);
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_ERRORCOPYINGFILE, cres_file_name);
}
//load the DLL.
@ -556,8 +561,8 @@ LTRESULT dsi_InitClientShellDE()
bm_UnbindModule(g_pClientMgr->m_hShellModule);
g_pClientMgr->m_hShellModule = LTNULL;
g_pClientMgr->SetupError(LT_INVALIDSHELLDLL, "cres.dll");
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_INVALIDSHELLDLL, "cres.dll");
g_pClientMgr->SetupError(LT_INVALIDSHELLDLL, cres_file_name);
RETURN_ERROR_PARAM(1, InitClientShellDE, LT_INVALIDSHELLDLL, cres_file_name);
}
//let the dll know it's instance handle.

2
engine/runtime/sound/src/iltsound.cpp
View File

@ -148,7 +148,7 @@ DECLARE_SOUND_FACTORY( Win32 )
// the enumerator override
#define SOUND_DRIVER_DLL "SndDrv.dll";
#define SOUND_DRIVER_DLL "ltjs_snddrv.dll";
bool CWin32SoundFactory::FillSoundSystems( char* pcSoundSysNames, uint uiMaxStringLen )
{

3
engine/runtime/sound/src/sys/s_dx8/CMakeLists.txt
View File

@ -38,9 +38,8 @@ ltjs_add_defaults(ltjs_snd_drv)
set_target_properties(
ltjs_snd_drv
PROPERTIES
OUTPUT_NAME snddrv
OUTPUT_NAME ltjs_snddrv
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_BIN_DIR}
)
if (MSVC)

3
engine/runtime/winbuild/lithtech/CMakeLists.txt
View File

@ -554,8 +554,7 @@ target_compile_definitions(
set_target_properties(
ltjs_lith_tech
PROPERTIES
OUTPUT_NAME lithtech
RUNTIME_OUTPUT_DIRECTORY ${LTJS_BIN_DIR}
OUTPUT_NAME ltjs_lithtech
)
if (MSVC)

3
engine/runtime/winbuild/ltmsg/CMakeLists.txt
View File

@ -25,9 +25,8 @@ ltjs_add_defaults(ltjs_lt_msg)
set_target_properties(
ltjs_lt_msg
PROPERTIES
OUTPUT_NAME ltmsg
OUTPUT_NAME ltjs_ltmsg
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_BIN_DIR}
)
install(

3
engine/runtime/winbuild/server/CMakeLists.txt
View File

@ -391,9 +391,8 @@ target_compile_definitions(
set_target_properties(
ltjs_server
PROPERTIES
OUTPUT_NAME server
OUTPUT_NAME ltjs_server
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_BIN_DIR}
)
if (MSVC)

4
engine/runtime/winbuild/server/server.def
View File

@ -1,8 +1,6 @@
; server.def : Declares the module parameters.
LIBRARY "server.DLL"
EXPORTS
CreateServer @1
DeleteServer @2
DeleteServer @2

5
game/clientfxdll/CMakeLists.txt
View File

@ -108,9 +108,8 @@ target_compile_definitions(
set_target_properties(
ltjs_game_client_fx
PROPERTIES
OUTPUT_NAME clientfx
OUTPUT_NAME ltjs_clientfx
PREFIX ""
SUFFIX .fxd
)
if (MSVC)
@ -124,5 +123,5 @@ endif ()
install(
TARGETS
ltjs_game_client_fx
RUNTIME DESTINATION "./game"
RUNTIME DESTINATION "./Game"
)

5
game/clientres/to2/CMakeLists.txt
View File

@ -32,13 +32,12 @@ ltjs_add_defaults(ltjs_to2_client_res)
set_target_properties(
ltjs_to2_client_res
PROPERTIES
OUTPUT_NAME cres
OUTPUT_NAME ltjs_cres
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_TO2_BIN_DIR}
)
install(
TARGETS
ltjs_to2_client_res
RUNTIME DESTINATION "./game"
RUNTIME DESTINATION "./Game"
)

2
game/clientshelldll/clientshellshared/clientfxdb.cpp
View File

@ -230,7 +230,7 @@ bool CClientFXDB::LoadFxDll()
UnloadFxDll();
// Load the library
const char *sName = "ClientFX.fxd";
const char *sName = "ltjs_clientfx.dll";
char sTmp[MAX_PATH + 1];
LTSNPrintF(sTmp, sizeof(sTmp), "Game\\%s", sName);

5
game/clientshelldll/to2/CMakeLists.txt
View File

@ -207,9 +207,8 @@ endif ()
set_target_properties(
ltjs_to2_client_shell
PROPERTIES
OUTPUT_NAME cshell
OUTPUT_NAME ltjs_cshell
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_TO2_BIN_DIR}
)
if (MSVC)
@ -248,5 +247,5 @@ target_link_libraries(
install(
TARGETS
ltjs_to2_client_shell
RUNTIME DESTINATION "./game"
RUNTIME DESTINATION "./Game"
)

3
game/libs/serverdir/CMakeLists.txt
View File

@ -38,9 +38,8 @@ endif ()
set_target_properties(
ltjs_server_dir
PROPERTIES
OUTPUT_NAME serverdir
OUTPUT_NAME ltjs_serverdir
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_BIN_DIR}
)
install(

6
game/objectdll/to2/CMakeLists.txt
View File

@ -62,10 +62,8 @@ endif ()
set_target_properties(
ltjs_to2_object
PROPERTIES
OUTPUT_NAME object
OUTPUT_NAME ltjs_object
PREFIX ""
SUFFIX .lto
RUNTIME_OUTPUT_DIRECTORY ${LTJS_TO2_BIN_DIR}
)
if (MSVC)
@ -91,5 +89,5 @@ target_link_libraries(
install(
TARGETS
ltjs_to2_object
RUNTIME DESTINATION "./game"
RUNTIME DESTINATION "./Game"
)

5
game/serverres/to2/CMakeLists.txt
View File

@ -29,13 +29,12 @@ ltjs_add_defaults(ltjs_to2_server_res)
set_target_properties(
ltjs_to2_server_res
PROPERTIES
OUTPUT_NAME sres
OUTPUT_NAME ltjs_sres
PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${LTJS_TO2_BIN_DIR}
)
install(
TARGETS
ltjs_to2_server_res
RUNTIME DESTINATION "./game"
RUNTIME DESTINATION "./Game"
)