Skip to content

Commit

Permalink
Merge pull request #22 from MasterLaplace/21-fix-build-error
Browse files Browse the repository at this point in the history
21 Fix Build Error
  • Loading branch information
Martin-Boucault-35 authored Oct 18, 2023
2 parents 6e1ea18 + 8874936 commit 777ea5e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 206 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -524,3 +524,6 @@ dkms.conf

.Test/
Docs/Engine-3D/
launcher
Projects
requirements.txt
1 change: 1 addition & 0 deletions Launcher/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ all: install
install:
@$(ECHO) $(BOLD) $(GREEN)"\n► INSTALL Launcher 📦 !\n"$(DEFAULT)
@$(PYTHON) -m pip install --upgrade pip -q
@$(PIP) install PyQt5 -q
@$(PIP) freeze | grep -v moddb > ./requirements.txt 2> /dev/null
@$(PIP) install -r ./requirements.txt -q
@$(ECHO) $(BOLD) $(GREEN)$(LIGHT_BLUE)" INSTALL Launcher 📦"$(DEFAULT)
Expand Down
203 changes: 0 additions & 203 deletions Launcher/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ print:
@$(ECHO) $(BOLD) $(GREEN)"\n► MAKEFILE 📖 !"$(DEFAULT)

lib:
@$(MAKE) all -C ./Libs $(NO_PRINT)
@-$(MAKE) all -C ./Libs $(NO_PRINT)
@-$(ECHO) $(BOLD) $(GREEN)"\n► LIB ⛽ !"$(DEFAULT)

launcher: fclean
Expand Down
11 changes: 9 additions & 2 deletions Scripts/install_csfml.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ DIR="CSFML"
INSTALL_DIR=~/csfml

# install SFML dependencies
sudo apt-get update
sudo apt-get install -y libsfml-dev libcsfml-dev
if command -v apt-get &> /dev/null; then
sudo apt-get update
sudo apt-get install -y libsfml-dev libcsfml-dev
elif command -v dnf &> /dev/null; then
sudo dnf update
else
echo "DNF or APT package manager not found, exiting"
exit 1
fi

# clone CSFML repository
cd build
Expand Down

0 comments on commit 777ea5e

Please sign in to comment.