Browse Source

wscript(android,windows): add sdl2 to installation path

pull/244/head
nillerusr 2 years ago
parent
commit
823e437005
  1. 11
      inputsystem/wscript
  2. 5
      wscript

11
inputsystem/wscript

@ -43,17 +43,8 @@ def build(bld):
if bld.env.DEST_OS == 'win32': if bld.env.DEST_OS == 'win32':
libs += ['USER32'] libs += ['USER32']
install_path = bld.env.LIBDIR
# Copy SDL2 dependency install_path = bld.env.LIBDIR
if bld.env.DEST_OS == 'win32':
bld(
rule=(('cp' if 'MSYSTEM' in os.environ or sys.platform != 'win32' else 'copy')+' ${SRC} ${TGT}'),
source='../lib/win32/'+bld.env.DEST_CPU+'/SDL2.dll',
target='SDL2.dll',
install_path=install_path,
)
bld.shlib( bld.shlib(
source = source, source = source,

5
wscript

@ -591,6 +591,11 @@ def configure(conf):
def build(bld): def build(bld):
os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU) os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)
if bld.env.DEST_OS in ['win32', 'android']:
sdl_name = 'SDL2.dll' if bld.env.DEST_OS == 'win32' else 'libSDL2.so'
sdl_path = os.path.join('lib', bld.env.DEST_OS, bld.env.DEST_CPU, sdl_name)
bld.install_files('${PREFIX}/', [sdl_path])
if bld.env.DEST_OS == 'win32': if bld.env.DEST_OS == 'win32':
projects['game'] += ['utils/bzip2'] projects['game'] += ['utils/bzip2']
projects['dedicated'] += ['utils/bzip2'] projects['dedicated'] += ['utils/bzip2']

Loading…
Cancel
Save