mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-13 22:22:05 +00:00
Adjusted EngineStubPosix for Linux rbdmap
This commit is contained in:
Robert Beckebans
parent
ab2ee0612b
commit
869e6994b4
3 changed files with 78 additions and 31 deletions
|
|
@ -17,7 +17,7 @@ file(GLOB MC_DMAP_SOURCES dmap/*.cpp)
|
|||
if(WIN32)
|
||||
list(APPEND MC_SOURCES main.cpp)
|
||||
else()
|
||||
list(APPEND MC_SOURCES ../../stub/EngineStubPosix.cpp)
|
||||
list(APPEND MC_SOURCES main_posix.cpp)
|
||||
endif()
|
||||
|
||||
set(MC_FRAMEWORK_INCLUDES
|
||||
|
|
@ -86,23 +86,12 @@ set(MC_RENDERER_SOURCES
|
|||
file(GLOB MIKKTSPACE_INCLUDES ../../libs/mikktspace/*.h)
|
||||
file(GLOB MIKKTSPACE_SOURCES ../../libs/mikktspace/*.c)
|
||||
|
||||
if(NOT ZLIB_FOUND)
|
||||
#file(GLOB MC_ZLIB_INCLUDES ../../libs/zlib/*.h)
|
||||
#file(GLOB MC_ZLIB_SOURCES ../../libs/zlib/*.c)
|
||||
# list(APPEND MC_ZLIB_SOURCES ../../libs/zlib/minizip/unzip.cpp)
|
||||
# list(APPEND MC_ZLIB_SOURCES ../../libs/zlib/minizip/ioapi.c)
|
||||
endif()
|
||||
|
||||
|
||||
set(MC_INCLUDES_ALL
|
||||
${MC_INCLUDES}
|
||||
${MC_FRAMEWORK_INCLUDES}
|
||||
${MC_RENDERER_INCLUDES}
|
||||
${MC_DMAP_INCLUDES}
|
||||
${MIKKTSPACE_INCLUDES}
|
||||
${JPG_INCLUDES}
|
||||
${PNG_INCLUDES}
|
||||
#${MC_ZLIB_INCLUDES}
|
||||
)
|
||||
|
||||
set(MC_SOURCES_ALL
|
||||
|
|
@ -111,9 +100,6 @@ set(MC_SOURCES_ALL
|
|||
${MC_RENDERER_SOURCES}
|
||||
${MC_DMAP_SOURCES}
|
||||
${MIKKTSPACE_SOURCES}
|
||||
${JPEG_SOURCES}
|
||||
${PNG_SOURCES}
|
||||
#${MC_ZLIB_SOURCES}
|
||||
)
|
||||
|
||||
source_group("main" FILES ${MC_INCLUDES})
|
||||
|
|
@ -126,16 +112,13 @@ source_group("renderer" FILES ${MC_RENDERER_INCLUDES})
|
|||
source_group("renderer" FILES ${MC_RENDERER_SOURCES})
|
||||
source_group("libs\\mikktspace" FILES ${MIKKTSPACE_INCLUDES})
|
||||
source_group("libs\\mikktspace" FILES ${MIKKTSPACE_SOURCES})
|
||||
#source_group("zlib" FILES ${MC_ZLIB_INCLUDES})
|
||||
#source_group("zlib" FILES ${MC_ZLIB_SOURCES})
|
||||
|
||||
set(MC_PRECOMPILED_SOURCES ${MC_SOURCES_ALL})
|
||||
list(REMOVE_ITEM MC_PRECOMPILED_SOURCES ${MC_ZLIB_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${MIKKTSPACE_SOURCES})
|
||||
list(REMOVE_ITEM MC_PRECOMPILED_SOURCES ${MIKKTSPACE_SOURCES})
|
||||
|
||||
include_directories(
|
||||
.
|
||||
../../idlib
|
||||
../../libs/zlib
|
||||
)
|
||||
|
||||
if(MSVC)
|
||||
|
|
@ -199,19 +182,19 @@ else()
|
|||
SEPARATE_ARGUMENTS(_compiler_FLAGS)
|
||||
|
||||
if (USE_PRECOMPILED_HEADERS)
|
||||
add_custom_target(precomp_header_typeinfo ALL
|
||||
add_custom_target(precomp_header_rbdmap ALL
|
||||
COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x c++-header precompiled.h -o precompiled.h.gch
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
COMMENT "Creating idlib/precompiled.h.gch for typeinfogen"
|
||||
COMMENT "Creating tools/compilers/precompiled.h.gch for rbdmap"
|
||||
)
|
||||
endif()
|
||||
|
||||
add_executable(typeinfogen ${MC_SOURCES_ALL} ${MC_INCLUDES_ALL})
|
||||
add_dependencies(typeinfogen idlib)
|
||||
add_executable(rbdmap ${MC_SOURCES_ALL} ${MC_INCLUDES_ALL})
|
||||
add_dependencies(rbdmap idlib)
|
||||
if (USE_PRECOMPILED_HEADERS)
|
||||
add_dependencies(typeinfogen precomp_header_typeinfo)
|
||||
add_dependencies(rbdmap precomp_header_rbdmap)
|
||||
endif()
|
||||
target_link_libraries(typeinfogen idlib)
|
||||
target_link_libraries(rbdmap idlib)
|
||||
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -522,8 +522,8 @@ public:
|
|||
};
|
||||
|
||||
virtual void QueueShowShell() { }; // Will activate the shell on the next frame.
|
||||
virtual void idCommon::UpdateScreen( bool, bool ) { }
|
||||
void idCommon::InitTool( const toolFlag_t, const idDict*, idEntity* ) { }
|
||||
virtual void UpdateScreen( bool, bool ) { }
|
||||
void InitTool( const toolFlag_t, const idDict*, idEntity* ) { }
|
||||
|
||||
//virtual currentGame_t GetCurrentGame() const {
|
||||
// return DOOM_CLASSIC;
|
||||
|
|
@ -573,4 +573,6 @@ int main( int argc, char** argv )
|
|||
}
|
||||
|
||||
Dmap_f( args );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,9 +38,10 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#include <fnmatch.h>
|
||||
|
||||
idEventLoop* eventLoop;
|
||||
idDeclManager* declManager;
|
||||
idSys* sys = NULL;
|
||||
|
||||
|
||||
|
||||
#define STDIO_PRINT( pre, post ) \
|
||||
va_list argptr; \
|
||||
va_start( argptr, fmt ); \
|
||||
|
|
@ -48,10 +49,20 @@ idSys* sys = NULL;
|
|||
vprintf( fmt, argptr ); \
|
||||
printf( post ); \
|
||||
printf(post); \
|
||||
va_end( argptr )
|
||||
va_end( argptr ) \
|
||||
|
||||
|
||||
//idCVar com_developer( "developer", "0", CVAR_BOOL|CVAR_SYSTEM, "developer mode" );
|
||||
idCVar com_productionMode( "com_productionMode", "0", CVAR_SYSTEM | CVAR_BOOL, "0 - no special behavior, 1 - building a production build, 2 - running a production build" );
|
||||
|
||||
/*
|
||||
==============================================================
|
||||
|
||||
idSys
|
||||
|
||||
==============================================================
|
||||
*/
|
||||
|
||||
void Sys_Printf( const char* fmt, ... )
|
||||
{
|
||||
va_list argptr;
|
||||
|
|
@ -317,6 +328,14 @@ int Sys_Milliseconds()
|
|||
// DG end
|
||||
}
|
||||
|
||||
/*
|
||||
==============================================================
|
||||
|
||||
idCommon
|
||||
|
||||
==============================================================
|
||||
*/
|
||||
|
||||
class idCommonLocal : public idCommon
|
||||
{
|
||||
public:
|
||||
|
|
@ -378,7 +397,7 @@ public:
|
|||
}
|
||||
virtual void DPrintf( const char* fmt, ... )
|
||||
{
|
||||
/*STDIO_PRINT( "", "" );*/
|
||||
STDIO_PRINT( "", "" );
|
||||
}
|
||||
virtual void Warning( const char* fmt, ... )
|
||||
{
|
||||
|
|
@ -386,7 +405,7 @@ public:
|
|||
}
|
||||
virtual void DWarning( const char* fmt, ... )
|
||||
{
|
||||
/*STDIO_PRINT( "WARNING: ", "\n" );*/
|
||||
STDIO_PRINT( "WARNING: ", "\n" );
|
||||
}
|
||||
|
||||
// Prints all queued warnings.
|
||||
|
|
@ -550,7 +569,50 @@ public:
|
|||
// return DOOM_CLASSIC;
|
||||
//};
|
||||
//virtual void SwitchToGame(currentGame_t newGame) { };
|
||||
|
||||
void LoadPacifierBinarizeFilename( const char* filename, const char* reason ) { };
|
||||
void LoadPacifierBinarizeInfo( const char* info ) { };
|
||||
void LoadPacifierBinarizeMiplevel( int level, int maxLevel ) { };
|
||||
void LoadPacifierBinarizeProgress( float progress ) { };
|
||||
void LoadPacifierBinarizeEnd() { };
|
||||
// for images in particular we can measure more accurately this way (to deal with mipmaps)
|
||||
void LoadPacifierBinarizeProgressTotal( int total ) { };
|
||||
void LoadPacifierBinarizeProgressIncrement( int step ) { };
|
||||
};
|
||||
|
||||
idCommonLocal commonLocal;
|
||||
idCommon* common = &commonLocal;
|
||||
|
||||
|
||||
/*
|
||||
==============================================================
|
||||
|
||||
main
|
||||
|
||||
==============================================================
|
||||
*/
|
||||
|
||||
int main( int argc, char** argv )
|
||||
{
|
||||
idLib::common = common;
|
||||
idLib::cvarSystem = cvarSystem;
|
||||
idLib::fileSystem = fileSystem;
|
||||
idLib::sys = sys;
|
||||
|
||||
idLib::Init();
|
||||
cmdSystem->Init();
|
||||
cvarSystem->Init();
|
||||
idCVar::RegisterStaticVars();
|
||||
fileSystem->Init();
|
||||
declManager->Init();
|
||||
|
||||
idCmdArgs args;
|
||||
for( int i = 0; i < argc; i++ )
|
||||
{
|
||||
args.AppendArg( argv[i] );
|
||||
}
|
||||
|
||||
Dmap_f( args );
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in a new issue