rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build the gui builder by default

0.8
Bruno Van de Velde 2019-02-04 18:59:37 +01:00
parent 5d96ddf46b
commit 9c89d57ff0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -111,7 +111,7 @@ build_script:
- IF NOT "%SFML_PATH%" == "C:\SFML" ( - IF NOT "%SFML_PATH%" == "C:\SFML" (
mkdir %BUILD_FOLDER% && mkdir %BUILD_FOLDER% &&
cd %BUILD_FOLDER% && cd %BUILD_FOLDER% &&
cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DTGUI_SHARED_LIBS=%SHARED_LIBS% -DTGUI_BUILD_TESTS=%BUILD_TESTS% -DTGUI_BUILD_EXAMPLES=%BUILD_EXAMPLES% -DTGUI_OPTIMIZE_SINGLE_BUILD=%FAST_BUILD% -DSFML_DIR=%SFML_PATH%\lib\cmake\SFML .. && cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DTGUI_SHARED_LIBS=%SHARED_LIBS% -DTGUI_BUILD_TESTS=%BUILD_TESTS% -DTGUI_BUILD_EXAMPLES=%BUILD_EXAMPLES% -DTGUI_BUILD_GUI_BUILDER=FALSE -DTGUI_OPTIMIZE_SINGLE_BUILD=%FAST_BUILD% -DSFML_DIR=%SFML_PATH%\lib\cmake\SFML .. &&
msbuild tgui.sln /p:Configuration=%BUILD_TYPE% /m && msbuild tgui.sln /p:Configuration=%BUILD_TYPE% /m &&
cd .. && cd .. &&
IF "%BUILD_TESTS%"=="TRUE" ( IF "%BUILD_TESTS%"=="TRUE" (

2
CMakeLists.txt
View File

@ -49,7 +49,7 @@ else()
endif() endif()
tgui_set_option(TGUI_BUILD_TESTS FALSE BOOL "TRUE to build the TGUI tests") tgui_set_option(TGUI_BUILD_TESTS FALSE BOOL "TRUE to build the TGUI tests")
tgui_set_option(TGUI_BUILD_GUI_BUILDER FALSE BOOL "TRUE to compile the GUI Builder") tgui_set_option(TGUI_BUILD_GUI_BUILDER TRUE BOOL "TRUE to compile the GUI Builder")
tgui_set_option(TGUI_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it") tgui_set_option(TGUI_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it")
# Define the install directory for miscellaneous files # Define the install directory for miscellaneous files

4
changelog.txt
View File

@ -1,5 +1,5 @@
TGUI 0.8.3 (TBD) TGUI 0.8.3 (27 January 2019)
----------------- -----------------------------
- ListView widget added - ListView widget added
- EditBox can now have a suffix - EditBox can now have a suffix

2
tests/travis_linux_tests.sh
View File

@ -23,7 +23,7 @@ fi
mkdir $BUILD_FOLDER mkdir $BUILD_FOLDER
cd $BUILD_FOLDER cd $BUILD_FOLDER
CXXFLAGS="-fprofile-arcs -ftest-coverage -DTGUI_SKIP_DRAW_TESTS -DTGUI_REMOVE_DEPRECATED_CODE" cmake -DCMAKE_BUILD_TYPE=Debug -DTGUI_BUILD_TESTS=TRUE -DTGUI_OPTIMIZE_TESTS_SINGLE_BUILD=TRUE -DTGUI_OPTIMIZE_SINGLE_BUILD_THREADS=2 .. CXXFLAGS="-fprofile-arcs -ftest-coverage -DTGUI_SKIP_DRAW_TESTS -DTGUI_REMOVE_DEPRECATED_CODE" cmake -DCMAKE_BUILD_TYPE=Debug -DTGUI_BUILD_GUI_BUILDER=FALSE -DTGUI_BUILD_TESTS=TRUE -DTGUI_OPTIMIZE_TESTS_SINGLE_BUILD=TRUE -DTGUI_OPTIMIZE_SINGLE_BUILD_THREADS=2 ..
make -j2 make -j2
cd tests/ cd tests/
./tests ./tests