If sdl_only=1 do not use Assembly code by default because of poor portability - switch asm=1 necessary now; Removed final remnants of glScissor
This commit is contained in:
parent
46c785f3fc
commit
dac257e4b7
|
@ -3,6 +3,7 @@ D1X-Rebirth Changelog
|
||||||
20070828
|
20070828
|
||||||
--------
|
--------
|
||||||
d1x.ini, 2d/bitblt.c, include/args.h, main/args.c, main/automap.c, main/credits.c, main/inferno.c, main/newmenu.c, main/piggy.c, main/titles.c: Fixed some mem-leaks; Made show_fullscr() use ogl_ubitmapm_cs(); Removed use of glScissor for menus - using Blitting; Code cleanup
|
d1x.ini, 2d/bitblt.c, include/args.h, main/args.c, main/automap.c, main/credits.c, main/inferno.c, main/newmenu.c, main/piggy.c, main/titles.c: Fixed some mem-leaks; Made show_fullscr() use ogl_ubitmapm_cs(); Removed use of glScissor for menus - using Blitting; Code cleanup
|
||||||
|
SConstruct, arch/ogl/gr.c: If sdl_only=1 do not use Assembly code by default because of poor portability - switch asm=1 necessary now; Removed final remnants of glScissor
|
||||||
|
|
||||||
20070826
|
20070826
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -35,7 +35,7 @@ sharepath = str(ARGUMENTS.get('sharepath', DATA_DIR))
|
||||||
debug = int(ARGUMENTS.get('debug', 0))
|
debug = int(ARGUMENTS.get('debug', 0))
|
||||||
profiler = int(ARGUMENTS.get('profiler', 0))
|
profiler = int(ARGUMENTS.get('profiler', 0))
|
||||||
sdl_only = int(ARGUMENTS.get('sdl_only', 0))
|
sdl_only = int(ARGUMENTS.get('sdl_only', 0))
|
||||||
no_asm = int(ARGUMENTS.get('no_asm', 0))
|
asm = int(ARGUMENTS.get('asm', 0))
|
||||||
editor = int(ARGUMENTS.get('editor', 0))
|
editor = int(ARGUMENTS.get('editor', 0))
|
||||||
shareware = int(ARGUMENTS.get('shareware', 0))
|
shareware = int(ARGUMENTS.get('shareware', 0))
|
||||||
sdlmixer = int(ARGUMENTS.get('sdlmixer', 0))
|
sdlmixer = int(ARGUMENTS.get('sdlmixer', 0))
|
||||||
|
@ -383,7 +383,7 @@ else:
|
||||||
|
|
||||||
# arm architecture?
|
# arm architecture?
|
||||||
if (arm == 1):
|
if (arm == 1):
|
||||||
no_asm = 1
|
asm = 0
|
||||||
env.Append(CPPDEFINES = ['WORDS_NEED_ALIGNMENT'])
|
env.Append(CPPDEFINES = ['WORDS_NEED_ALIGNMENT'])
|
||||||
env.Append(CPPFLAGS = ['-mstructure-size-boundary=8'])
|
env.Append(CPPFLAGS = ['-mstructure-size-boundary=8'])
|
||||||
|
|
||||||
|
@ -421,7 +421,7 @@ if (profiler == 1):
|
||||||
lflags += ' -pg'
|
lflags += ' -pg'
|
||||||
|
|
||||||
# assembler code?
|
# assembler code?
|
||||||
if (no_asm == 0) and (sdl_only == 1):
|
if (asm == 1) and (sdl_only == 1):
|
||||||
print "including: ASSEMBLER"
|
print "including: ASSEMBLER"
|
||||||
env.Append(CPPDEFINES = ['ASM_VECMAT'])
|
env.Append(CPPDEFINES = ['ASM_VECMAT'])
|
||||||
Object(['texmap/tmappent.S', 'texmap/tmapppro.S'], AS='gcc', ASFLAGS='-D' + str(osdef) + ' -c ')
|
Object(['texmap/tmappent.S', 'texmap/tmapppro.S'], AS='gcc', ASFLAGS='-D' + str(osdef) + ' -c ')
|
||||||
|
@ -470,7 +470,7 @@ Help(PROGRAM_NAME + ', SConstruct file help:' +
|
||||||
'sdl_only=1' don't include OpenGL, use SDL-only instead
|
'sdl_only=1' don't include OpenGL, use SDL-only instead
|
||||||
'sdlmixer=1' (*NIX only) use SDL_Mixer for sound (includes external music support)
|
'sdlmixer=1' (*NIX only) use SDL_Mixer for sound (includes external music support)
|
||||||
'shareware=1' build SHAREWARE version
|
'shareware=1' build SHAREWARE version
|
||||||
'no_asm=1' don't use ASSEMBLER (only with sdl_only=1)
|
'asm=1' use ASSEMBLER code (only with sdl_only=1, requires NASM and x86)
|
||||||
'debug=1' build DEBUG binary which includes asserts, debugging output, cheats and more output
|
'debug=1' build DEBUG binary which includes asserts, debugging output, cheats and more output
|
||||||
'profiler=1' do profiler build
|
'profiler=1' do profiler build
|
||||||
'editor=1' build editor !EXPERIMENTAL!
|
'editor=1' build editor !EXPERIMENTAL!
|
||||||
|
|
|
@ -134,7 +134,7 @@ void ogl_get_verinfo(void){
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
printf("gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i gl_gettexlevelparam:%i gl_setgammaramp:%i gl_scissor:%i\n",GameArg.DbgGlIntensity4Ok,GameArg.DbgGlLuminance4Alpha4Ok,GameArg.DbgGlRGBA2Ok,GameArg.DbgGlReadPixelsOk,GameArg.DbgGlGetTexLevelParamOk,GameArg.DbgGlSetGammaRampOk,GameArg.OglScissorOk);
|
printf("gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i gl_gettexlevelparam:%i gl_setgammaramp:%i\n",GameArg.DbgGlIntensity4Ok,GameArg.DbgGlLuminance4Alpha4Ok,GameArg.DbgGlRGBA2Ok,GameArg.DbgGlReadPixelsOk,GameArg.DbgGlGetTexLevelParamOk,GameArg.DbgGlSetGammaRampOk);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue