Skip to content

fix building #1

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

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

fix building #1

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
42886c2
fix broken flags
Moth-Tolias Jul 17, 2024
efd2c8c
replace .hgignore with .gitignore
Moth-Tolias Jul 17, 2024
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
7 changes: 0 additions & 7 deletions .hgignore → .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Use glob syntax:
syntax: glob

# The local makefile should be ignored:
Makefile.local
Makefile.fordist
Expand Down Expand Up @@ -45,7 +42,3 @@ ogfx-trains.nml

# Ignore nml cache:
.nmlcache

# Ignore source directory cloned from ogfx-train-renders
syntax: regexp
^sprite_source/blender
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ GIT ?= git
PYTHON ?= python

UNIX2DOS ?= unix2dos
UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null 1>&2 && echo "-q" || echo "")

################################################################
# Get the Repository revision, tags and the modified status
Expand Down Expand Up @@ -395,7 +395,7 @@ bananas: $(DIR_NAME)

$(DIR_NAME).tar: $(DIR_NAME)
$(_E) "[BUNDLE TAR] $@"
$(_V) $(TAR) $(TAR_FLAGS) $@ $< --exclude=bananas.ini
$(_V) $(TAR) --exclude=bananas.ini $(TAR_FLAGS) $@ $<

bundle_tar: $(DIR_NAME).tar
bundle_zip: $(ZIP_FILENAME)
Expand Down