diff --git a/inputsystem/wscript b/inputsystem/wscript index c62fac18..51612cbf 100755 --- a/inputsystem/wscript +++ b/inputsystem/wscript @@ -50,7 +50,7 @@ def build(bld): if bld.env.DEST_OS == 'win32': bld( rule='cp ${SRC} ${TGT}', - source='../lib/win32/public/'+bld.env.DEST_CPU+'/SDL2.dll', + source='../lib/win32/'+bld.env.DEST_CPU+'/SDL2.dll', target='SDL2.dll', install_path=install_path, ) diff --git a/lib b/lib index 86166922..7ec9e138 160000 --- a/lib +++ b/lib @@ -1 +1 @@ -Subproject commit 8616692265f85926d6901600716e08c69f60d820 +Subproject commit 7ec9e1386e7c14539ce09cf27bf8903368afaaed diff --git a/wscript b/wscript index 44ef3ca1..dd6bbd46 100644 --- a/wscript +++ b/wscript @@ -363,8 +363,7 @@ def configure(conf): ] linkflags += [ - '/LIBPATH:'+os.path.abspath('.')+'/lib/win32/public/'+conf.env.DEST_CPU+'/', - '/LIBPATH:'+os.path.abspath('.')+'/lib/win32/common/'+conf.env.DEST_CPU+'/2015/release', + '/LIBPATH:'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/', '/LIBPATH:'+os.path.abspath('.')+'/dx9sdk/lib/'+conf.env.DEST_CPU+'/' ]