Merge pull request #12 from andrewlalis/development

Updated readme and linux static build settings.
This commit is contained in:
Andrew Lalis 2018-04-18 21:21:13 +01:00 committed by GitHub
commit c8b8cc1d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions

6
.gitignore vendored
View File

@ -1,3 +1,9 @@
*.pro *.pro
*.pro.user *.pro.user
*.autosave *.autosave
#Files generated by qmake.
.qmake.stash
Makefile
recipedb_plugin_import.cpp
#Build directories.
staticBuild_Linux/*

View File

@ -10,15 +10,9 @@ For the user interface, a [Qt](https://www.qt.io/) Application is built, both fo
### To-Do List ### To-Do List
* Finish User Interface
* Finish and ensure safety of SQL statements and tables in the database; ensure persistence.
* Implement Searching/Filtering
* Create an *Edit* mode in which the user can change a recipe's data.
* Create file protocol to save recipe data which is linked in the database.
* Create a file-naming protocol.
* No save button, should save everything automatically.
* Share Options: * Share Options:
* Social Media * Social Media
* Email * Email
* Generate PDF, Word Document * Generate PDF, Word Document
* More intuitive ingredient addition. It shouldn't be so tedious to add ingredients.
* Automatic Unit conversion for ingredients, using pre-determined conversion rates. * Automatic Unit conversion for ingredients, using pre-determined conversion rates.

View File

@ -2,8 +2,8 @@
#Builds a static release of the RecipeDB program for linux. #Builds a static release of the RecipeDB program for linux.
echo "Building static release..." echo "Building static release..."
qmake qmake
make -C /home/andrew/Programming/Projects/staticRelease/ clean make -C /home/andrew/Programming/Projects/RecipeDB/staticBuild_Linux/ clean
PATH=/home/andrew/Programming/Qt5_10static/bin:$PATH PATH=/home/andrew/Programming/Qt5_10static/bin:$PATH
export PATH export PATH
make -C /home/andrew/Programming/Projects/staticRelease/ make -C /home/andrew/Programming/Projects/RecipeDB/staticBuild_Linux/
echo "Done!" echo "Done!"