fix windows build hopefully

PyryM · Sep 29, 2022 · 62a99c0 · 62a99c0
1 parent ab8209c
commit 62a99c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,8 @@ models/
 /include/terra/
 /include/soloud/
 /include/bgfx/
-/depsbuild/
 /_build/build_generated.sh
+/_deps/
 *.log
 *.exe
 *.pdb

diff --git a/_build/cibuild.lua b/_build/cibuild.lua
@@ -59,23 +59,25 @@ cd '_deps'
 cmd(('curl -o terra.%s -L %s'):format(ARCHIVE_EXT, TERRA_URL))
 cmd(('curl -o trussfs.zip -L %s'):format(TRUSSFS_URL))
 if jit.os == "Windows" then
-  cmd("7z e terra." .. ARCHIVE_EXT)
-  cmd("7z e trussfs.zip")
+  cmd("7z x terra." .. ARCHIVE_EXT)
+  cmd("7z x trussfs.zip")
 else
   cmd("tar -xvf terra." .. ARCHIVE_EXT)
   cmd("unzip trussfs.zip")
 end
 cd '..'
 mkdir 'include/terra'
+mkdir 'lib'
+mkdir 'bin'
 cp('_deps/' .. TERRA_NAME .. '/include/*',  'include/')
-cp('_deps/' .. TERRA_NAME .. '/lib', 'lib')
-cp('_deps/' .. TERRA_NAME .. '/bin', 'bin')
+cp('_deps/' .. TERRA_NAME .. '/lib/*', 'lib/')
+cp('_deps/' .. TERRA_NAME .. '/bin/*', 'bin/')
 cp('_deps/include/*',  'include/')
 cp('_deps/lib/*', 'lib/')
 if jit.os == 'Windows' then
   cmd('mv bin/terra.exe', '.')
-  cp('lib/terra.dll', '.')
-  cp('lib/lua51.dll', '.')
+  cmd('mv bin/terra.dll', '.')
+  cmd('mv bin/lua51.dll', '.')
 elseif jit.os == 'Linux' then
   cmd('mv bin/terra', '.')
 else