update windows lib placement

CyExcel · Jul 28, 2022 · 5206f38 · 5206f38
1 parent 991585b
commit 5206f38
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
diff --git 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+'/'
 		]
+ −		win32/amd64/SDL2.dll
+ −		win32/amd64/SDL2.lib
+ −		win32/amd64/SDL2.pdb
+ −		win32/amd64/libjpeg.lib
+ −		win32/amd64/libpng.lib
+ −		win32/amd64/libz.lib
+ −		win32/amd64/opus.lib
+ −		win32/x86/SDL2.dll
+ −		win32/x86/SDL2.lib
+ −		win32/x86/SDL2.pdb
+ −		win32/x86/ati_compress_mt_vc10.lib
+ −		win32/x86/binkw32.lib
+ −		win32/x86/d3dx9.lib
+ −		win32/x86/ftol3.obj
+ −		win32/x86/libjpeg.lib
+ −		win32/x86/libpng.lib
+ −		win32/x86/libz.lib
+ −		win32/x86/nvtc.lib
+ −		win32/x86/openvr_api.lib
+ −		win32/x86/opus.lib
+ −		win32/x86/socketlib.lib
+ −		win32/x86/steam_api.lib