From: James Nobis <quel@quelrod.net>
Date: Sun, 7 Nov 2010 23:07:21 +0000 (-0600)
Subject: misc fixes stemming from issues with my #ifdef 0 and a commented out include
X-Git-Url: https://git.sesse.net/?p=freerainbowtables;a=commitdiff_plain;h=bc29e5b656a25ef7a5b1bc663c4326b2057592f1

misc fixes stemming from issues with my #ifdef 0 and a commented out include
---

diff --git a/BOINC software/BOINC client apps/distrrtgen/Makefile b/BOINC software/BOINC client apps/distrrtgen/Makefile
index d33961f..3d5f77f 100644
--- a/BOINC software/BOINC client apps/distrrtgen/Makefile	
+++ b/BOINC software/BOINC client apps/distrrtgen/Makefile	
@@ -27,6 +27,7 @@ SHELL = /bin/sh
 BOINC_DIR = /usr/share/boinc-dev
 BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib
+CC = g++
 COMMON_LIB_DIR = /usr/lib
 INCLUDES = -I../../../Common/rt\ api -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR) 
 COMMON_API_PATH = ../../../Common/rt\ api
@@ -39,10 +40,11 @@ CXXFLAGS = -g \
 	 -c \
 	 -DBOINC \
 	 $(INCLUDES) \
-	 $(OPTIMIZATION)
+	 $(OPTIMIZATION) \
+	 $(DEBUG)
 
 LFLAGS = -static -static-libgcc -Wall $(INCLUDES) $(OPTIMIZATION) -L$(BOINC_API_DIR) \
-	-L$(BOINC_LIB_DIR) -L /usr/X11R6/lib -L.
+	-L$(BOINC_LIB_DIR) -L /usr/X11R6/lib -L. $(DEBUG)
 
 LIBS = -lboinc_api -lboinc -lpthread -lssl libstdc++.a $(COMMON_LIB_DIR)/libssl.a $(COMMON_LIB_DIR)/libpthread.a
 OBJS = ChainWalkContext.o des_enc.o des_setkey.o distrrtgen.o ecb_enc.o HashAlgorithm.o HashRoutine.o md4.o md5.o Public.o
@@ -55,7 +57,7 @@ distrrtgen: libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboin
 	$(CXX) $(LFLAGS) $(OBJS) $(LIBS) -o distrrtgen
 
 libstdc++.a:
-	ln -s `g++ -print-file-name=libstdc++.a`
+	ln -s `$(CC) $(DEBUG) -print-file-name=libstdc++.a`
 
 clean:
 	/bin/rm -f distrrtgen *.o
diff --git a/Common/rt api/Public.cpp b/Common/rt api/Public.cpp
index b42c954..dc23bac 100644
--- a/Common/rt api/Public.cpp	
+++ b/Common/rt api/Public.cpp	
@@ -209,7 +209,7 @@ bool GetHybridCharsets(string sCharset, vector<tCharset>& vCharset)
 bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine)
 {
 	vLine.clear();
-#ifdef 0
+#ifdef USE_INTEGRATED_CHARSET
 	vLine.push_back("byte                        = []");
 	vLine.push_back("alpha                       = [ABCDEFGHIJKLMNOPQRSTUVWXYZ]");
 	vLine.push_back("alpha-space                 = [ABCDEFGHIJKLMNOPQRSTUVWXYZ ]");
diff --git a/Common/rt api/des_enc.c b/Common/rt api/des_enc.c
index f2c99b7..75c2de5 100644
--- a/Common/rt api/des_enc.c	
+++ b/Common/rt api/des_enc.c	
@@ -60,7 +60,7 @@
  */
 
 #include "des_locl.h"
-//#include "spr.h"
+#include "spr.h"
 
 extern	const DES_LONG des_SPtrans[8][64];