Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Installation path fix for UNIX systems #248

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Installation path fix for UNIX systems #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a37b832
fix installation path for unix
giuliods Aug 22, 2023
ecd3587
Merge branch 'andrei-drexler:master' into master
giuliods Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Quake/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ OBJS += $(SYSOBJ_RES)
# targets / rules
# ---------------------------

.PHONY: clean debug release
.PHONY: clean debug release uninstall

DEFAULT_TARGET := ironwail
all: $(DEFAULT_TARGET)
Expand All @@ -315,8 +315,15 @@ clean: $(MAKEFILE)
$(RM) *.o *.d $(DEFAULT_TARGET)

install: ironwail
cp ironwail /usr/local/games/quake
cp ironwail.pak /usr/local/games/quake
mkdir -p /usr/local/games/quake/
mkdir -p /usr/local/share/ironwail
cp ironwail /usr/local/games/ironwail
cp ironwail.pak /usr/local/share/ironwail/ironwail.pak

uninstall:
rm /usr/local/games/quake/ironwail.pak
rmdir /usr/local/games/quake
rm /usr/local/games/ironwail

#---------------------------------------------------------------
# include dependencies (if not running 'clean' target)
Expand Down
13 changes: 9 additions & 4 deletions Quake/quakedef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define IRONWAIL_VER_STRING QS_STRINGIFY(IRONWAIL_VER_MAJOR) "." QS_STRINGIFY(IRONWAIL_VER_MINOR) "." QS_STRINGIFY(IRONWAIL_VER_PATCH) IRONWAIL_VER_SUFFIX

#define CONSOLE_TITLE_STRING "Ironwail " IRONWAIL_VER_STRING
#define WINDOW_TITLE_STRING "Quake/Ironwail " IRONWAIL_VER_STRING
#define CONFIG_NAME "ironwail.cfg"
#define SCREENSHOT_PREFIX "ironwail"
#define ENGINE_PAK "ironwail.pak"
#define WINDOW_TITLE_STRING "Quake/Ironwail " IRONWAIL_VER_STRING
#define CONFIG_NAME "ironwail.cfg"
#define SCREENSHOT_PREFIX "ironwail"
#if defined(__unix)
#define ENGINE_PATH_UNIX "/usr/local/share"
#define ENGINE_PAK ENGINE_PATH_UNIX "/ironwail/ironwail.pak"
#else
#define ENFINE_PAK "ironwail.pak"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo "ENFINE" here

#endif
#define ENGINE_USERDIR_WIN "Ironwail"
#define ENGINE_USERDIR_OSX "Ironwail"
#define ENGINE_USERDIR_UNIX ".ironwail"
Expand Down