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

Jump to bottom

Replace PACKAGE_VERSION & __DATE__ with release tag #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace PACKAGE_VERSION & __DATE__ with release tag #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,22 @@
SOURCEDIRS := source
INCLUDEDIRS := source


# Try to find the SDK version if it wasn't already provided e.g. by the parent Makefile
SDK_VERSION ?= $(shell git describe --tags --exact-match --dirty 2>/dev/null)

# Fallback to commit hash
ifeq ($(SDK_VERSION),)
VERSION_ID := "commit $(shell git describe --always --dirty 2>/dev/null)"
else
VERSION_ID := "BlocksDS $(SDK_VERSION)"
endif


# Defines passed to all files
# ---------------------------

DEFINES := -DPACKAGE_VERSION=\"2.3.0\"
DEFINES := -DVERSION_ID=\"$(VERSION_ID)\"

# Libraries
# ---------
Expand Down
3 changes: 0 additions & 3 deletions source/compile_date.c
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion source/ndstool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ unsigned int appFlags = 0x01;

void Title()
{
printf("Nintendo DS rom tool " PACKAGE_VERSION " - %s\nby Rafael Vuijk, Dave Murphy, Alexei Karpenko\n",CompileDate);
printf("Nintendo DS rom tool (" VERSION_ID ")\nby Rafael Vuijk, Dave Murphy, Alexei Karpenko\n");
}

// Argument information
Expand Down
2 changes: 0 additions & 2 deletions source/ndstool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,3 @@ extern char *gamecode;
extern int latency1;
extern int latency2;
extern unsigned int romversion;

extern const char CompileDate[];