id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 06:34:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #174 from danmcgoo/master

Browse source 
Few little improvements
This commit is contained in:
Robert Beckebans 2014-10-07 19:30:02 +02:00
commit 9e32b00c87
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
neo/CMakeLists.txt
View file

@ -18,6 +18,9 @@ option(OPENAL
option(FFMPEG
"Use FMPEG to render Bink videos" ON)
option(ONATIVE
"Optimize for the host CPU" OFF)
if(UNIX)
set(OPENAL TRUE)
endif()
@ -68,6 +71,10 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
set(my_warn_flags "${my_warn_flags} -Wno-local-type-template-args -Wno-unknown-warning-option -Wno-inline-new-delete")
endif()
if(NOT CMAKE_CROSSCOMPILING AND ONATIVE)
add_definitions(-march=native)
endif()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -O0 -ggdb -fno-strict-aliasing ${my_warn_flags}")
#set(CMAKE_C_FLAGS_DEBUGALL "${CMAKE_C_FLAGS_DEBUGALL} -g -ggdb -D_DEBUG -fno-strict-aliasing ${my_warn_flags}")
#set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -g -ggdb -D_DEBUG -O1 -fno-omit-frame-pointer -fno-strict-aliasing ${my_warn_flags}")

6
neo/framework/FileSystem.cpp
View file

@ -846,14 +846,14 @@ void idFileSystemLocal::AddRenderProgs( idStrList& files )
idStrList work;
// grab all the renderprogs
idStr path = RelativePathToOSPath( "renderprogs/cgb", "fs_basepath" );
idStr path = RelativePathToOSPath( "renderprogs/cgb", "fs_savepath" );
ListOSFiles( path, "*.cgb", work );
for( int i = 0; i < work.Num(); i++ )
{
files.Append( idStr( "renderprogs/cgb/" ) + work[i] );
}
path = RelativePathToOSPath( "renderprogs/hlsl", "fs_basepath" );
path = RelativePathToOSPath( "renderprogs/hlsl", "fs_savepath" );
ListOSFiles( path, "*.v360", work );
for( int i = 0; i < work.Num(); i++ )
{
@ -865,7 +865,7 @@ void idFileSystemLocal::AddRenderProgs( idStrList& files )
files.Append( idStr( "renderprogs/hlsl/" ) + work[i] );
}
path = RelativePathToOSPath( "renderprogs/gl", "fs_basepath" );
path = RelativePathToOSPath( "renderprogs/gl", "fs_savepath" );
ListOSFiles( path, "*.*", work );
for( int i = 0; i < work.Num(); i++ )
{

6
neo/renderer/RenderProgs_GLSL.cpp
View file

@ -1772,11 +1772,11 @@ GLuint idRenderProgManager::LoadGLSLShader( GLenum target, const char* name, con
idStr programHLSL = StripDeadCode( hlslCode, inFile, compileMacros, builtin );
programGLSL = ConvertCG2GLSL( programHLSL, inFile, target == GL_VERTEX_SHADER, programUniforms );
fileSystem->WriteFile( outFileHLSL, programHLSL.c_str(), programHLSL.Length(), "fs_basepath" );
fileSystem->WriteFile( outFileGLSL, programGLSL.c_str(), programGLSL.Length(), "fs_basepath" );
fileSystem->WriteFile( outFileHLSL, programHLSL.c_str(), programHLSL.Length(), "fs_savepath" );
fileSystem->WriteFile( outFileGLSL, programGLSL.c_str(), programGLSL.Length(), "fs_savepath" );
if( r_useUniformArrays.GetBool() )
{
fileSystem->WriteFile( outFileUniforms, programUniforms.c_str(), programUniforms.Length(), "fs_basepath" );
fileSystem->WriteFile( outFileUniforms, programUniforms.c_str(), programUniforms.Length(), "fs_savepath" );
}
}
else