Merge branch 'master' of https://github.com/T4rtP1ck13/Terminal-Based-Calculator
This commit is contained in:
commit
772b6c0609
15
Makefile
15
Makefile
|
@ -1,6 +1,11 @@
|
|||
# Makefile for Terminal-Based-Calculator
|
||||
<<<<<<< HEAD
|
||||
# Project by T4rtP1ck13 (https://github/com/T4rtP1ck13)
|
||||
# Makefile by Bowuigi (https://github.com/Bowuigi)
|
||||
=======
|
||||
# Project by t4rtp1ck73
|
||||
# Makefile by Bowuigi
|
||||
>>>>>>> 8135a01a0888ee9436d2121d08ae17c8b40f14ab
|
||||
|
||||
IN=$(wildcard *.cpp)
|
||||
OUT=tbc
|
||||
|
@ -9,7 +14,11 @@ CPP=c++
|
|||
STRIP=strip
|
||||
DESTDIR=/usr/local/bin
|
||||
DESKTOPDIR=/usr/local/share/applications
|
||||
<<<<<<< HEAD
|
||||
DESKTOPFILE=Calculator.desktop
|
||||
=======
|
||||
DESKTOPFILE=calculator.desktop
|
||||
>>>>>>> 8135a01a0888ee9436d2121d08ae17c8b40f14ab
|
||||
|
||||
build:
|
||||
@echo "Compiling..."
|
||||
|
@ -34,12 +43,18 @@ desktop: install
|
|||
echo "Terminal=true" >> $(DESKTOPFILE)
|
||||
echo "Comment='Calculator for simple math problems'" >> $(DESKTOPFILE)
|
||||
echo "Type=Application" >> $(DESKTOPFILE)
|
||||
<<<<<<< HEAD
|
||||
echo "Icon=${HOME}/CalculatorFiles/CalculatorIcon.png" >> $(DESKTOPFILE)
|
||||
=======
|
||||
>>>>>>> 8135a01a0888ee9436d2121d08ae17c8b40f14ab
|
||||
|
||||
@echo "Copying the desktop file to" $(DESKTOPDIR) "..."
|
||||
mkdir -p $(DESKTOPDIR)
|
||||
cp $(DESKTOPFILE) $(DESKTOPDIR)
|
||||
<<<<<<< HEAD
|
||||
cp $(DESKTOPFILE) $(HOME)/Desktop
|
||||
=======
|
||||
>>>>>>> 8135a01a0888ee9436d2121d08ae17c8b40f14ab
|
||||
@echo "Done!"
|
||||
|
||||
clean:
|
||||
|
|
23
README.md
23
README.md
|
@ -1,16 +1,27 @@
|
|||
Installation instructions:
|
||||
Open up your terminal application, Then type in
|
||||
> git clone https://github.com/T4rtP1ck13/Terminal-Based-Calculator"
|
||||
```sh
|
||||
git clone https://github.com/T4rtP1ck13/Terminal-Based-Calculator
|
||||
```
|
||||
|
||||
this downloads the folder with all the necessary files, next you have to go into the folder
|
||||
we downloaded to do this type in
|
||||
> cd Terminal-Based-Calculator
|
||||
```sh
|
||||
cd Terminal-Based-Calculator
|
||||
```
|
||||
|
||||
and finally to run the installer type in
|
||||
> bash Installer.sh.
|
||||
and finally to run the install it, run
|
||||
```sh
|
||||
sudo make install
|
||||
```
|
||||
|
||||
or to install it locally, run
|
||||
```sh
|
||||
make install DESTDIR=~/.local/bin DESKTOPDIR=~/.local/share/applications
|
||||
```
|
||||
|
||||
Execution instructions:
|
||||
To execute the program you will need to go onto your desktop and click/double click on
|
||||
> Calculator.
|
||||
To execute the program you can either run `tbc` in your terminal, or go onto your desktop and click/double click on
|
||||
`Calculator`.
|
||||
|
||||
NOTE: This calculator is only for fun to test out my coding skills, Please report issues in the issue tab so I can fix them. Please don't be rude in the issues tab :).
|
||||
|
|
Reference in a new issue