folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix commit id display under MinGW compile

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-20 16:42:33 -08:00
parent f8e68b70b5
commit f713a69ff9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
makefile
View file

@ -342,10 +342,10 @@ else
NETWORK_OPT += -DUSE_SHARED NETWORK_OPT += -DUSE_SHARED
endif endif
ifneq (,$(shell if exist .git-commit-id type .git-commit-id)) ifneq (,$(shell if exist .git-commit-id type .git-commit-id))
GIT_COMMIT_ID==$(shell if exist .git-commit-id type .git-commit-id) GIT_COMMIT_ID=$(shell if exist .git-commit-id type .git-commit-id)
endif endif
endif endif
CFLAGS_GIT = -DSIM_GIT_COMMIT_ID="$(GIT_COMMIT_ID)" CFLAGS_GIT = -DSIM_GIT_COMMIT_ID=\"$(GIT_COMMIT_ID)\"
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
CFLAGS_G = -g -ggdb -g3 CFLAGS_G = -g -ggdb -g3
CFLAGS_O = -O0 CFLAGS_O = -O0

4
scp.c
View file

@ -2297,10 +2297,10 @@ if (vdelt)
fprintf (st, " delta %d", vdelt); fprintf (st, " delta %d", vdelt);
if (flag) if (flag)
fprintf (st, " [%s, %s, %s]", sim_si64, sim_sa64, sim_snet); fprintf (st, " [%s, %s, %s]", sim_si64, sim_sa64, sim_snet);
fprintf (st, "\n");
#if defined(SIM_GIT_COMMIT_ID) #if defined(SIM_GIT_COMMIT_ID)
fprintf (st, "git commit id: %8.8s\n", SIM_GIT_COMMIT_ID); fprintf (st, " git commit id: %8.8s", SIM_GIT_COMMIT_ID);
#endif #endif
fprintf (st, "\n");
return SCPE_OK; return SCPE_OK;
} }