Revert "a couple hooks needed for crosscompiling a 32 bit version"

This reverts commit df6256e.

cos it broke the build

cppForSwig/Makefile

@@ -22,7 +22,7 @@ else
 PYTHON_INCLUDES=$(shell $(PYVER)-config --includes )
 endif
 
-CPPFLAGS += $(ARMORY_CXXFLAGS) -Icryptopp -Ileveldb/include -DUSE_CRYPTOPP -D__STDC_LIMIT_MACROS
+CPPFLAGS += $(ARMORY_CPPFLAGS) -Icryptopp -Ileveldb/include -DUSE_CRYPTOPP -D__STDC_LIMIT_MACROS
 LDLIBS += -lpthread -Lleveldb
 SWIG_OPTS    += -c++ -python -classic -threads
 
@@ -36,19 +36,19 @@ CXXCPP += $(CPPFLAGS)
 all: ../_CppBlockUtils.so ../qrc_img_resources.py
 
 ../_CppBlockUtils.so: $(OBJS) CppBlockUtils_wrap.o
-	$(LINK) -shared -fPIC $(LDLIBS) $(LDFLAGS) $(CXXFLAGS) $(ARMORY_LDFLAGS) $(OBJS) $(STATICPYTHON) CppBlockUtils_wrap.o -o ../_CppBlockUtils.so
+	$(LINK) -shared -fPIC $(LDLIBS) $(LDFLAGS) $(CXXFLAGS) $(OBJS) $(STATICPYTHON) CppBlockUtils_wrap.o -o ../_CppBlockUtils.so
 
 ../qrc_img_resources.py: ../imgList.xml
 	pyrcc4 -o ../qrc_img_resources.py ../imgList.xml
 
 
 #**************************************************************************
 libcryptopp.a: Makefile
-	$(MAKE) -C cryptopp libcryptopp.a CRYPTOPP_CXXFLAGS=$(ARMORY_CXXFLAGS) CRYPTOPP_LDFLAGS=$(ARMORY_LDFLAGS)
+	$(MAKE) -C cryptopp libcryptopp.a
 	mv cryptopp/libcryptopp.a .
 
 libleveldb.a: Makefile
-	$(MAKE) -C leveldb libleveldb.a OPT=$(ARMORY_CXXFLAGS)
+	$(MAKE) -C leveldb libleveldb.a
 	mv leveldb/libleveldb.a .
 
 %.o: %.cpp %.h

cppForSwig/cryptopp/Makefile

@@ -1,5 +1,4 @@
-CXXFLAGS = -DNDEBUG -g -O2 $(CRYPTOPP_CXXFLAGS)
-LDFLAGS = $(CRYPTOPP_LDFLAGS)
+CXXFLAGS = -DNDEBUG -g -O2
 #CXXFLAGS = -g
 # -fPIC is supported. Please report any breakage of -fPIC as a bug.
 CXXFLAGS += -fPIC