Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Commit

Permalink
Fix problems leading to failing build mentioned in #207, change readme
Browse files Browse the repository at this point in the history
Update dependencies in both the travis file and the readme
Add 0 as parameter to (hopefully) every occurance of vsx::filesystem_archive_reader::load()
  • Loading branch information
waweic committed Oct 31, 2018
1 parent 7778d47 commit af2a860
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 22 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Expand Up @@ -5,15 +5,10 @@ branches:
language: cpp
compiler:
- gcc
dist: xenial

before_install:
- sudo add-apt-repository -y ppa:team-xbmc/ppa
- sudo apt-get update -qq
dist: xenial

install:
- sudo apt-get install libglew-dev libpng12-dev libjpeg-dev libpulse-dev libopenexr-dev libxrandr-dev build-essential libsdl2-dev cmake
- git submodule init
- git submodule update
- sudo apt-get install libglew-dev libpng-dev libjpeg-dev libpulse-dev libopenexr-dev libxrandr-dev libfreetype6-dev libsdl2-dev libegl1-mesa-dev libgles2-mesa-dev build-essential cmake

script: bash ./appimage/create_appimage.sh
script: cd appimage; bash ./create_appimage.sh
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -28,11 +28,11 @@ Compilation Instructions for a basic version of VSXu Ubuntu/Debian:

Make sure you have met the build dependencies:

sudo apt-get install libglew-dev libpng12-dev libjpeg-dev libpulse-dev libopenexr-dev libxrandr-dev make cmake g++ gcc git-core
sudo apt-get install libglew-dev libpng-dev libjpeg-dev libpulse-dev libopenexr-dev libxrandr-dev libfreetype6-dev libsdl2-dev libegl1-mesa-dev libgles2-mesa-dev build-essential cmake

Optional dependencies:

sudo apt-get install libopencv-dev libcvaux-dev libhighgui-dev libcv-dev
sudo apt-get install libopencv-dev

Get the VSXu Source from github via ssh:

Expand Down
2 changes: 1 addition & 1 deletion lib/common/test/test_command_list.cpp
Expand Up @@ -13,7 +13,7 @@ using namespace vsx;
void test_legacy()
{
filesystem my_filesystem;
my_filesystem.get_archive()->load("/tmp/dolphin.vsx", true);
my_filesystem.get_archive()->load("/tmp/dolphin.vsx", true, 0);
vsx_command_list command_list(true);
command_list.set_filesystem(&my_filesystem);
command_list.load_from_file("_states/_default", true);
Expand Down
6 changes: 3 additions & 3 deletions lib/common/test/test_filesystem_archive_vsx.cpp
Expand Up @@ -40,7 +40,7 @@ void test_plain_files()

filesystem_archive_vsx_reader archive_load;

archive_load.load("test_filesystem_archive.vsx", false);
archive_load.load("test_filesystem_archive.vsx", false, 0);

test_assert(archive_load.is_file("test_filesystem_archive_file_1"));
test_assert(archive_load.is_file("test_filesystem_archive_file_2"));
Expand All @@ -57,7 +57,7 @@ void test_text_files()

filesystem_archive_vsx_reader archive_load;

archive_load.load("test_filesystem_archive.vsx", false);
archive_load.load("test_filesystem_archive.vsx", false, 0);

vsx_nw_vector<filesystem_archive_file_read> files;
archive_load.files_get(files);
Expand All @@ -84,7 +84,7 @@ void test_singleton_archive_prohibited()
void test_filesystem_archive_reader()
{
filesystem my_filesystem;
my_filesystem.get_archive()->load("test_filesystem_archive.vsx", true);
my_filesystem.get_archive()->load("test_filesystem_archive.vsx", true, 0);
file* my_file = my_filesystem.f_open("test_filesystem_archive_file_1");
test_assert(my_file);
char* entire_file = my_filesystem.f_gets_entire(my_file);
Expand Down
6 changes: 3 additions & 3 deletions lib/common/test/test_filesystem_archive_vsxz.cpp
Expand Up @@ -40,7 +40,7 @@ void test_plain_files()

filesystem_archive_vsxz_reader archive_load;

archive_load.load("test_filesystem_archive.vsxz", false);
archive_load.load("test_filesystem_archive.vsxz", false, 0);

test_assert(archive_load.is_file("test_filesystem_archive_file_1"));
test_assert(archive_load.is_file("test_filesystem_archive_file_2"));
Expand All @@ -58,7 +58,7 @@ void test_text_files()

filesystem_archive_vsxz_reader archive_load;

archive_load.load("test_filesystem_archive.vsxz", false);
archive_load.load("test_filesystem_archive.vsxz", false, 0);

file* handle = new file;
archive_load.file_open("test_string", handle);
Expand All @@ -77,7 +77,7 @@ void test_text_files()
void test_filesystem_archive_reader()
{
filesystem my_filesystem;
my_filesystem.get_archive()->load("test_filesystem_archive.vsxz", true);
my_filesystem.get_archive()->load("test_filesystem_archive.vsxz", true, 0);
file* my_file = my_filesystem.f_open("test_filesystem_archive_file_1");
test_assert(my_file);
char* entire_file = my_filesystem.f_gets_entire(my_file);
Expand Down
4 changes: 2 additions & 2 deletions lib/common/test/test_thread_pool.cpp
Expand Up @@ -11,7 +11,7 @@
class foo
{
public:
vsx_thread_pool pool;
vsx_thread_pool<> pool;
};

int main(int argc, char *argv[])
Expand All @@ -30,7 +30,7 @@ int main(int argc, char *argv[])

threaded_task
{
test_assert(!vsx_thread_pool::instance()->wait_all(100));
test_assert(!vsx_thread_pool<>::instance()->wait_all(100));
for_n(i, 0, 32)
vsx_printf(L"hello world from thread 2\n");
}
Expand Down
2 changes: 1 addition & 1 deletion lib/engine/include/audiovisual/vsx_pack.h
Expand Up @@ -22,7 +22,7 @@ class pack
pack(vsx_string<> filename)
{
fs = new vsx::filesystem();
fs->get_archive()->load( filename.c_str(), true );
fs->get_archive()->load( filename.c_str(), true, 0);
vsx::json json = vsx::json_helper::load_json_from_file("manifest.json", fs);
vsx_string<> name = json["name"].string_value().c_str();

Expand Down
2 changes: 1 addition & 1 deletion lib/widget/include/widgets/vsx_widget_label.cpp
Expand Up @@ -65,7 +65,7 @@ void vsx_widget_label::draw_debug(vsx_vector3f position)

void vsx_widget_label::i_draw()
{
req(visible);
req(visible > 0.0f);

vsx_vector3<> position = parent->get_pos_p() + pos;

Expand Down
2 changes: 1 addition & 1 deletion programs/tools/vsxz/extract.h
Expand Up @@ -33,7 +33,7 @@ void extract()
if ( vsx_argvector::get_instance()->has_param("m") )
perf_cpu_instructions.cpu_instructions_begin();

filesystem.get_archive()->load( filename.c_str(), vsx_argvector::get_instance()->has_param("mt") );
filesystem.get_archive()->load( filename.c_str(), vsx_argvector::get_instance()->has_param("mt"), 0);

// Sanitize archive
if (!filesystem.get_archive()->is_archive_populated())
Expand Down

0 comments on commit af2a860

Please sign in to comment.