about summary refs log tree commit diff stats
diff options
context:
space:
mode:
author~login@aussies.space <login@aussies.space>2019-11-14 10:33:45 +1100
committer~login@aussies.space <login@aussies.space>2019-11-14 10:33:45 +1100
commit4aed82e1ae6ce1e8442dade2c811eda3e2e27c05 (patch)
tree393ea9b4d0e574163cb7143f9c40e0e3a9f60928
parentd58ca79724c69b81985cd241b6c88faf6d38c1a9 (diff)
downloadtcoin-4aed82e1ae6ce1e8442dade2c811eda3e2e27c05.tar.gz
KROWBAR_OFF, DA_OFF and MINERCOIN_OFF are now treated as config definitions
The KROWBAR_OFF, DA_OFF and MINERCOIN_OFF symbolic constants are now included in tcoin_defs.cpp and pcoin_defs.cpp and have been removed from the main source files, tcoin.cpp and pcoin.cpp.

ntcoin has been modified to include #define KROWBAR_OFF, #define DA_OFF and #define MINERCOIN_OFF in pcoin_defs.cpp and tcoin_defs.cpp by default, since those three features are only (as of now) available on the tilde.town server and on no other server.
-rwxr-xr-xntcoin15
-rw-r--r--pcoin.cpp4
-rw-r--r--tcoin.cpp4
3 files changed, 12 insertions, 11 deletions
diff --git a/ntcoin b/ntcoin
index 117a484..a421512 100755
--- a/ntcoin
+++ b/ntcoin
@@ -23,7 +23,10 @@ then
 #define TCOIN_PATH_W_SLASH "'`/usr/bin/realpath -s $1`'/tcoin/"
 #define TCOIN_SCRYPT_PATH "'`/usr/bin/realpath -s $1`'/tcoin/bin/scrypt"
 #define PCOIN_BIN_PATH "'`/usr/bin/realpath -s $2`'/pcoin"
-#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "'
+#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "
+#define KROWBAR_OFF
+#define DA_OFF
+#define MINERCOIN_OFF'
 else
   if [ -d "`/usr/bin/realpath -s $1`/tcoin" ]
   then
@@ -145,7 +148,10 @@ else
 #define TCOIN_PATH_W_SLASH "'`/usr/bin/realpath -s $1`'/tcoin/"
 #define TCOIN_SCRYPT_PATH "'`/usr/bin/realpath -s $1`'/tcoin/bin/scrypt"
 #define PCOIN_BIN_PATH "'`/usr/bin/realpath -s $2`'/pcoin"
-#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "' > "`/usr/bin/realpath -s $1`/tcoin/bin/tcoin_defs.cpp"
+#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "
+#define KROWBAR_OFF
+#define DA_OFF
+#define MINERCOIN_OFF' > "`/usr/bin/realpath -s $1`/tcoin/bin/tcoin_defs.cpp"
       /bin/chmod 640 "`/usr/bin/realpath -s $1`/tcoin/bin/tcoin_defs.cpp"
     fi
     if [ -e "`/usr/bin/realpath -s $1`/tcoin/bin/pcoin_defs.cpp" ]
@@ -165,7 +171,10 @@ else
 #define TCOIN_PATH_W_SLASH "'`/usr/bin/realpath -s $1`'/tcoin/"
 #define TCOIN_SCRYPT_PATH "'`/usr/bin/realpath -s $1`'/tcoin/bin/scrypt"
 #define PCOIN_BIN_PATH "'`/usr/bin/realpath -s $2`'/pcoin"
-#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "' > "`/usr/bin/realpath -s $1`/tcoin/bin/pcoin_defs.cpp"
+#define PCOIN_BIN_PATH_W_SPACE "'`/usr/bin/realpath -s $2`'/pcoin "
+#define KROWBAR_OFF
+#define DA_OFF
+#define MINERCOIN_OFF' > "`/usr/bin/realpath -s $1`/tcoin/bin/pcoin_defs.cpp"
       /bin/chmod 640 "`/usr/bin/realpath -s $1`/tcoin/bin/pcoin_defs.cpp"
     fi
     if [ -e "`/usr/bin/realpath -s $1`/tcoin/bin/tcoin" ]
diff --git a/pcoin.cpp b/pcoin.cpp
index 4494f11..9031cb3 100644
--- a/pcoin.cpp
+++ b/pcoin.cpp
@@ -38,10 +38,6 @@
 #define TCOIN_SCRYPT_PATH "/home/login/bin/scrypt"
 */
 
-#define KROWBAR_OFF
-#define DA_OFF
-#define MINERCOIN_OFF
-
 #define LS_HOME_CMD "/bin/ls /home"
 #define BIN_ECHO_CMD "/bin/echo $$"
 #ifndef KROWBAR_OFF
diff --git a/tcoin.cpp b/tcoin.cpp
index 3595b69..932b84f 100644
--- a/tcoin.cpp
+++ b/tcoin.cpp
@@ -33,10 +33,6 @@
 #define TCOIN_SCRYPT_PATH "/home/login/bin/scrypt"
 */
 
-#define KROWBAR_OFF
-#define DA_OFF
-#define MINERCOIN_OFF
-
 #define LS_HOME_CMD "/bin/ls /home"
 #define BIN_ECHO_CMD "/bin/echo $$"
 #ifndef KROWBAR_OFF