TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed incorrect patch merge introduced in the last commit

Browse source
This commit is contained in:
zicodxx 2012-09-01 23:24:00 +02:00
parent 495333522d
commit b0df198dc9
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20120901
--------
main/vers_id.h: Fixed incorrect patch merge introduced in the last commit
20120728
--------
SConstruct, main/vers_id.h: Some Sconstruct lovin': Respect LDFLAGS; Made D1XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp

12
main/vers_id.h
View file

@ -3,12 +3,12 @@
#ifndef _VERS_ID
#define _VERS_ID
+#define __stringize2(X) #X
+#define __stringize(X) __stringize2(X)
+
+#define D1XMAJOR __stringize(D1XMAJORi)
+#define D1XMINOR __stringize(D1XMINORi)
+#define D1XMICRO __stringize(D1XMICROi)
#define __stringize2(X) #X
#define __stringize(X) __stringize2(X)
#define D1XMAJOR __stringize(D1XMAJORi)
#define D1XMINOR __stringize(D1XMINORi)
#define D1XMICRO __stringize(D1XMICROi)
#define BASED_VERSION "Registered v1.5 Jan 5, 1996"
#define VERSION D1XMAJOR "." D1XMINOR "." D1XMICRO