Commit 90881eed authored by Martin Schultz's avatar Martin Schultz
Browse files

Merge branch 'master' into unstable

tely this changs all unstable submodules
parents b29cb22a 40b1cc25
......@@ -17,7 +17,7 @@ cd rel
del *.exe
::invoke cmake
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......
......@@ -21,10 +21,10 @@ del /s /q CMakeCache.txt
:: build installer package dlls and copy them to Openflipper dir
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
move OpenFlipper-*.exe "OpenFlipper-Free-Git-Master-%CI_BUILD_REF%-%BUILD_PLATFORM%-%STRING_ARCH%-%QT_VERSION%.exe"
\ No newline at end of file
move OpenFlipper-*.exe "OpenFlipper-Free-Git-Master-%CI_BUILD_REF%-%BUILD_PLATFORM%-%STRING_ARCH%-%QT_VERSION%.exe"
......@@ -26,7 +26,7 @@ del /q DartConfiguration.tcl
echo %Time%: running cmake ...
::invoke cmake to fix paths
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -36,4 +36,4 @@ copy ..\Build\Qt*.dll testBinaries
copy ..\Build\icu*.dll testBinaries
run_tests.bat
IF %errorlevel% NEQ 0 exit /b %errorlevel%
\ No newline at end of file
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -127,7 +127,7 @@ for /l %%x in (0, 1, 3) do (
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DGLUT_INCLUDE_DIR="%GLUT_INCLUDE_DIR%" -DGLUT_glut_LIBRARY="%GLUT_GLUT_LIBRARY%" -DGLEW_INCLUDE_DIR="%GLEW_INCLUDE_DIR%" -DGLEW_LIBRARY="%GLEW_LIBRARY_DIR%" -DQWT6_INCLUDE_DIR=%QWT6_INCLUDE_DIR% -DQWT6_LIBRARY=%QWT6_LIBRARY% -DQWT6_LIBRARY_DIR=%QWT6_LIBRARY_DIR% -DCMAKE_WINDOWS_LIBS_DIR=%CMAKE_WINDOWS_LIBS_DIR%
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......@@ -141,7 +141,7 @@ del *.exe
:: collect dlls and copy them to Openflipper dir
"C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "PACKAGE"
......@@ -161,4 +161,4 @@ cd ..
cd Build
dir
\ No newline at end of file
dir
OpenFlipper @ 29aa322e
Subproject commit ef101799412e123d1451af0d922b213e97c83042
Subproject commit 29aa322efed8eea4f5b4cfb00fa389afd55e9ba6
Plugin-Decimater @ 6afdf687
Subproject commit cef0fd62c89a8b4c9c59b3013669150a9f66829c
Subproject commit 6afdf6879dead1ef3c124dc425bdadddd37b95f9
Plugin-HoleFilling @ e8331f5d
Subproject commit 71978b02017679e11956b190d2b1597b6c3eee8d
Subproject commit e8331f5db3c87ca0cae1d3f9d9b726c48349076d
Plugin-INI @ d0234494
Subproject commit 000c4a6c61cbacbd601b1d5cd3e3ba9bca1c7893
Subproject commit d0234494c973635eb93171cc4295649d0ad8ff73
Subproject commit 6e2ec0b952ba013e57db271f23bd8391de83284c
Subproject commit dfaa0433db935e1c6b80db20458d869a4fac65ad
Plugin-PropertyVis @ 4f930191
Subproject commit 7a5f003d7f996e9e3a430e48354be4b8fb3bbcbc
Subproject commit 4f9301915ebce75b6ce614a3c348d3d56bf049dd
Subproject commit eed1f6667bae532bff6b92fedb0054d7aa85c86c
Subproject commit a1393f6180c2a86ffe137c6d79159ad41b7aa220
OpenFlipper README.TXT
OpenFlipper [![pipeline status](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/badges/master/pipeline.svg)](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/commits/master)
=======================
The documentation is on our website:
http://www.openflipper.org
# Getting Source Code from git
## Download Binaries
### Windows
* [VS2015 Qt-5.9.0 64-Bit](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/rel?job=Deploy:VS2015-Qt-5.9.0-x64)
* [VS2015 Qt-5.9.0 32-Bit](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/rel?job=Deploy:VS2015-Qt-5.9.0-x32)
* [VS2015 Qt-5.6.2 64-Bit](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/rel?job=Deploy:VS2015-Qt-5.6.2-x64)
* [VS2015 Qt-5.6.2 32-Bit](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/rel?job=Deploy:VS2015-Qt-5.6.2-x32)
* [VS2013 Qt-5.5.1 64-Bit](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/rel?job=Deploy:VS2013-Qt-5.5.1-x64)
### macOS 10.13
* [MacOS-10.13](https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/-/jobs/artifacts/master/browse/build-release?job=Deploy:Mac-Cpp11)
## Getting Source Code from git
Clone the repository with submodules:
git clone --recursive https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free.git
# Required libs:
## Required libs:
Qt ( >= 5.5 ) http://www.qtsoftware.com/downloads
OpenGL http://www.opengl.org
GLUT http://www.opengl.org/resources/libraries/glut
GLEW http://glew.sourceforge.net
qwt ( >=6.0 ) optional http://qwt.sourceforge.net/
# Compiling OpenFlipper:
## Compiling OpenFlipper:
A detailed compilation manual is available [here](http://openflipper.org/Documentation/latest/a00099.html).
Latest NEWS
......
Type-OpenVolumeMesh @ 73f2f6dd
Subproject commit 4f5fc9f368c14703c140228fac02a97f47605361
Subproject commit 73f2f6dd4845295074b96fd1ce5d26fbdeec9c36
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment