diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-09-20 06:54:53 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-09-20 06:54:53 (GMT) |
| commit | 5f36117b8ff7e14ae450e770cdaa67e60561672d (patch) | |
| tree | 4a2a37410499f50efddc31f4834fcb313a24fae1 /src | |
| parent | 3eda281be13dfe9eb8fcbc9fb82e75e74d107e01 (diff) | |
restore missing digits. make --info work better. fix parser / path bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/PlatformUtils.cc | 4 | ||||
| -rw-r--r-- | src/openscad.cc | 5 | ||||
| -rw-r--r-- | src/parsersettings.cc | 1 | ||||
| -rw-r--r-- | src/version_check.h | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/PlatformUtils.cc b/src/PlatformUtils.cc index f731a9a..5059b78 100644 --- a/src/PlatformUtils.cc +++ b/src/PlatformUtils.cc @@ -107,14 +107,14 @@ std::string PlatformUtils::info() #endif // ENABLE_CGAL s << "OpenSCAD Version: " << TOSTRING(OPENSCAD_VERSION) - << "\nCompiler: " << compiler_info - << "\nCompile date: " << __DATE__ + << "\nCompiler, build date: " << compiler_info << ", " << __DATE__ << "\nBoost version: " << BOOST_LIB_VERSION << "\nEigen version: " << EIGEN_WORLD_VERSION << "." << EIGEN_MAJOR_VERSION << "." << EIGEN_MINOR_VERSION << "\nCGAL version, kernels: " << TOSTRING(CGAL_VERSION) << ", " << cgal_3d_kernel << ", " << cgal_2d_kernel << ", " << cgal_2d_kernelEx << "\nOpenCSG version: " << OPENCSG_VERSION_STRING << "\nQt version: " << qtVersion << "\nMingW build: " << mingwstatus + << "\nOPENSCADPATH: " << getenv("OPENSCADPATH") ; return s.str(); } diff --git a/src/openscad.cc b/src/openscad.cc index a8e71b1..5a219ac 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -176,8 +176,9 @@ Camera get_camera( po::variables_map vm ) return camera; } -int cmdline( const char* deps_output_file, const char* filename, Camera &camera, const char *output_file, fs::path original_path, Render::type renderer ) +int cmdline( const char* deps_output_file, const char* filename, Camera &camera, const char *output_file, fs::path original_path, Render::type renderer, char ** argv ) { + parser_init(boosty::stringy(boost::filesystem::path( argv[0] ).parent_path())); Tree tree; #ifdef ENABLE_CGAL CGALEvaluator cgalevaluator(tree); @@ -630,7 +631,7 @@ int main(int argc, char **argv) if (output_file) { if (!filename) help(argv[0]); - rc = cmdline( deps_output_file, filename, camera, output_file, original_path, renderer ); + rc = cmdline( deps_output_file, filename, camera, output_file, original_path, renderer, argv ); } else if (QtUseGUI()) { diff --git a/src/parsersettings.cc b/src/parsersettings.cc index 5ad30e1..63a7713 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -130,5 +130,6 @@ void parser_init(const std::string &applicationpath) if (is_directory(tmpdir = libdir / "libraries")) { librarydir = boosty::stringy(tmpdir); } + if (!librarydir.empty()) add_librarydir(librarydir); } diff --git a/src/version_check.h b/src/version_check.h index db17962..6e07208 100644 --- a/src/version_check.h +++ b/src/version_check.h @@ -87,11 +87,12 @@ a time, to avoid confusion. #else #endif // ENABLE_OPENCSG +#ifndef OPENSCAD_TESTING #include <QtCore/qglobal.h> #if QT_VERSION < 0x040400 #error QT library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check #endif // QT - +#endif #ifdef ENABLE_OPENCSG #endif // OpenCSG |