gallant/catbox3d
1
0
Fork 0
forked from karx/catbox
Code Issues 2 Pull requests Packages Projects 1 Releases Wiki Activity

WIP

Browse source
This commit is contained in:
gallant 2023-03-31 11:46:12 -05:00
parent 3aecca7482
commit 51cb83bb3b
6 changed files with 72 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.idea/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

12
.idea/catbox.iml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/catbox.iml" filepath="$PROJECT_DIR$/.idea/catbox.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

3
Cargo.toml
View file

@ -18,7 +18,8 @@ features = ["image", "ttf"]
rodio = { version = "0.15.0", optional = true}
[build-dependencies]
ureq = "2.6.2"
ureq = {version = "2.6.2", features = ["native-tls"]}
native-tls = "0.2.7"
zip = "0.6.4"
tempfile = "3.5.0"

58
build.rs
View file

@ -1,10 +1,12 @@
use std::env;
use std::fs::File;
use std::io::{copy, BufWriter};
use std::io::{copy, BufWriter, Read};
use std::path::Path;
use std::path::PathBuf;
use ureq::{Agent};
use zip::ZipArchive;
use ureq::{AgentBuilder};
use zip::{ZipArchive, read::ZipFile};
use std::sync::Arc;
use native_tls;
use tempfile::tempdir;
@ -22,12 +24,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let temp_dir = tempdir()?;
let temp_path = temp_dir.path();
//returns zip files
let url_sdl = download_files("https://github.com/libsdl-org/SDL/releases/download/release-2.26.4/SDL2-devel-2.26.4-mingw.zip")?;
let url_sdl = download_files(temp_path.clone(),"https://github.com/libsdl-org/SDL/releases/download/release-2.26.4/SDL2-devel-2.26.4-mingw.zip")?;
let url_ttf = download_files("https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-devel-2.20.2-mingw.zip")?;
let url_ttf = download_files(temp_path.clone(),"https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-devel-2.20.2-mingw.zip")?;
let url_image = download_files(temp_path.clone(),"https://github.com/libsdl-org/SDL_image/releases/download/release-2.6.3/SDL2_image-devel-2.6.3-mingw.zip")?;
let url_image = download_files("https://github.com/libsdl-org/SDL_image/releases/download/release-2.6.3/SDL2_image-devel-2.6.3-mingw.zip")?;
//GETTING LIBRARY DIRECTORIES GIVEN THE BUILD TARGET
let mut lib_dir = manifest_dir.clone();
@ -47,18 +49,30 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
lib_dir.push("32");
dll_dir.push("32");
}
//could only error if dir already exists so no need to handle error lolz
//could only error if dir already exists so no need to handle error
std::fs::create_dir_all(&lib_dir);
std::fs::create_dir_all(&dll_dir);
//NOW THAT WE HAVE THE OUTPUT DIRECTORIES, WE NEED TO EXTRACT THE ZIP FILES INTO THE
//CORRECT DIRECTORIES
let mut zip_sdl2 = ZipArchive::new(url_sdl)?;
let mut zip_ttf = ZipArchive::new(url_ttf)?;
let mut zip_image = ZipArchive::new(url_image)?;
zip_ttf.extract(&temp_path)?;
zip_image.extract(&temp_path)?;
zip_sdl2.extract(&temp_path)?;
let zip_vec = vec![ZipArchive::new(&url_sdl)?,ZipArchive::new(&url_ttf)?,ZipArchive::new(&url_image)?];
let mut part = String::new();
let mut lib_folders:Vec<ZipFile> = Vec::new();
match state{
State::Six => {
part = "x86_64".to_string();
},
State::Three => {
part = "i686".to_string();
},
}
let map_thing = zip_vec.into_iter();
let mut lib_folder = lib_folders.get_mut(0).unwrap();
let mut vuf = vec![0; lib_folder.size() as usize];
let buf = vuf.as_mut_slice();
lib_folder.read(buf);
//SEARCHES AND LINKS LIBRARIES WITH CARGO
println!("cargo:rustc-link-search=all={}", lib_dir.display());
@ -76,12 +90,20 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
}
}
}
url_image.sync_all()?;
url_ttf.sync_all()?;
url_sdl.sync_all()?;
}
Ok(())
}
pub fn download_files(url: &str) -> Result<File, Box<dyn std::error::Error>> {
let agent = Agent::new();
pub fn download_files<P: AsRef<Path>>(
path: P,
url: &str
) -> Result<File, Box<dyn std::error::Error>> {
let agent = AgentBuilder::new()
.tls_connector(Arc::new(native_tls::TlsConnector::new()?))
.build();
let resp = agent.get(url).call()?;
let content_disposition = resp.header("content-disposition").unwrap();
@ -95,7 +117,9 @@ pub fn download_files(url: &str) -> Result<File, Box<dyn std::error::Error>> {
.trim_matches('"');
// Create a new File object to store the downloaded zip file
let file = File::create(file_name)?;
let mut path_buf = path.as_ref().to_path_buf();
path_buf.push(file_name);
let file = File::create(path_buf)?;
// Use a BufWriter to efficiently write the contents of the response to the file
let mut writer = BufWriter::new(file);