From 5bd516b98804ce84865bd4cf57a86fac66f48236 Mon Sep 17 00:00:00 2001 From: lucas Date: Fri, 14 Mar 2014 17:58:03 +0100 Subject: [PATCH] Updated directory hierarchy to contain DSRC include files in 'include/dsrc/' instead of raw 'include/' --- Makefile | 4 ++-- Makefile.c++11 | 6 +----- examples/cpplib/Makefile | 2 +- examples/cpplib/example1.pro | 2 +- examples/cpplib/example2.pro | 2 +- include/{ => dsrc}/Configurable.h | 0 include/{ => dsrc}/Dsrc.h | 2 +- include/{ => dsrc}/DsrcArchive.h | 0 include/{ => dsrc}/DsrcModule.h | 0 include/{ => dsrc}/Fastq.h | 0 include/{ => dsrc}/FastqFile.h | 0 include/{ => dsrc}/FastqRecord.h | 0 include/{ => dsrc}/Globals.h | 0 py/Interface.cpp | 10 +++++----- py/Jamroot | 12 +++++++----- src/BitMemory.h | 2 +- src/BlockCompressor.h | 2 +- src/BlockCompressorExt.h | 4 ++-- src/Buffer.h | 2 +- src/Common.h | 2 +- src/Configurable.cpp | 2 +- src/Crc32.h | 2 +- src/DataPool.h | 2 +- src/DataQueue.h | 2 +- src/DataStream.h | 2 +- src/DnaModeler.h | 2 +- src/DnaModelerBasicB2.h | 2 +- src/DnaModelerHuffman.h | 2 +- src/DnaModelerProxy.h | 2 +- src/DnaModelerRCO.h | 2 +- src/DsrcArchive.cpp | 2 +- src/DsrcFile.h | 2 +- src/DsrcIo.h | 2 +- src/DsrcModule.cpp | 4 ++-- src/DsrcOperator.h | 2 +- src/DsrcWorker.cpp | 2 +- src/DsrcWorker.h | 2 +- src/ErrorHandler.h | 2 +- src/Fastq.h | 2 +- src/FastqFile.cpp | 2 +- src/FastqIo.h | 2 +- src/FastqParser.h | 2 +- src/FastqStream.h | 2 +- src/FileStream.h | 2 +- src/Makefile | 2 +- src/QualityEncoder.h | 2 +- src/QualityModeler.h | 2 +- src/QualityModelerProxy.h | 2 +- src/QualityOrderModeler.h | 2 +- src/QualityPositionModeler.h | 2 +- src/QualityRLEModeler.h | 2 +- src/RangeCoder.h | 2 +- src/RecordsProcessor.h | 2 +- src/Stats.h | 2 +- src/StdStream.h | 2 +- src/SymbolCoderRC.h | 2 +- src/TagModeler.h | 2 +- src/dsrc20-vs2k10.vcxproj | 14 +++++++------- src/dsrc20-vs2k10.vcxproj.filters | 14 +++++++------- src/dsrc20-vs2k12.vcxproj | 14 +++++++------- src/dsrc20-vs2k12.vcxproj.filters | 14 +++++++------- src/dsrc20.pro | 14 +++++++------- src/huffman.h | 2 +- src/main.cpp | 2 +- src/utils.h | 2 +- 65 files changed, 101 insertions(+), 103 deletions(-) rename include/{ => dsrc}/Configurable.h (100%) rename include/{ => dsrc}/Dsrc.h (95%) rename include/{ => dsrc}/DsrcArchive.h (100%) rename include/{ => dsrc}/DsrcModule.h (100%) rename include/{ => dsrc}/Fastq.h (100%) rename include/{ => dsrc}/FastqFile.h (100%) rename include/{ => dsrc}/FastqRecord.h (100%) rename include/{ => dsrc}/Globals.h (100%) diff --git a/Makefile b/Makefile index c4350f2..2c33aa6 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,9 @@ CXXFLAGS += -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CXXFLAGS += -Wall #-pedantic # comment the line below to compile and link in shared mode -# CXXFLAGS += -static +CXXFLAGS += -static -# compile using boost::thread +# by default compile using boost::thread # boost::thread from 1.50+ explicitely requires boost::system library CXXFLAGS += -DUSE_BOOST_THREAD DEP_LIBS += -lboost_thread -lboost_system diff --git a/Makefile.c++11 b/Makefile.c++11 index 177e4a8..f287b65 100644 --- a/Makefile.c++11 +++ b/Makefile.c++11 @@ -10,7 +10,7 @@ CXXFLAGS += -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CXXFLAGS += -Wall #-pedantic # there are problems when statically linking with pthreads and libstdc++ -# so only shared linking is possible +# so use only shared linking #CXXFLAGS += -static # compile using c++11 @@ -25,10 +25,6 @@ bin: lib: cd src; ${MAKE} lib -pylib: - # make sure to configure properly Jamroot file and have boost libraries installed - cd py; bjam - examples: cd examples/cpplib; ${MAKE} diff --git a/examples/cpplib/Makefile b/examples/cpplib/Makefile index 7c9dd56..5b24baf 100644 --- a/examples/cpplib/Makefile +++ b/examples/cpplib/Makefile @@ -1,6 +1,6 @@ all: example1 example2 -INC_PATH = ../../include/ +INC_PATH = ../../include/dsrc LIB_PATH = ../../lib/ DSRC_LIB = -ldsrc diff --git a/examples/cpplib/example1.pro b/examples/cpplib/example1.pro index 61e756a..1f14cc1 100644 --- a/examples/cpplib/example1.pro +++ b/examples/cpplib/example1.pro @@ -6,7 +6,7 @@ CONFIG -= qt SOURCES += \ example1.cpp -INCLUDEPATH += ../../include/ +INCLUDEPATH += ../../include/dsrc # Specify path to DSRC library file LIBS += /home/lucas/dev/workspace/dsrc20-dev/lib/libdsrc.a diff --git a/examples/cpplib/example2.pro b/examples/cpplib/example2.pro index b7b5e1f..f7bcdf8 100644 --- a/examples/cpplib/example2.pro +++ b/examples/cpplib/example2.pro @@ -6,7 +6,7 @@ CONFIG -= qt SOURCES += \ example2.cpp -INCLUDEPATH += ../../include/ +INCLUDEPATH += ../../include/dsrc # Specify path to DSRC library file LIBS += /home/lucas/dev/workspace/dsrc20-dev/lib/libdsrc.a diff --git a/include/Configurable.h b/include/dsrc/Configurable.h similarity index 100% rename from include/Configurable.h rename to include/dsrc/Configurable.h diff --git a/include/Dsrc.h b/include/dsrc/Dsrc.h similarity index 95% rename from include/Dsrc.h rename to include/dsrc/Dsrc.h index 47dee61..35290c7 100644 --- a/include/Dsrc.h +++ b/include/dsrc/Dsrc.h @@ -10,7 +10,7 @@ #ifndef H_DSRC #define H_DSRC -#include "../include/Globals.h" +#include "Globals.h" #include "DsrcModule.h" #include "FastqFile.h" #include "DsrcArchive.h" diff --git a/include/DsrcArchive.h b/include/dsrc/DsrcArchive.h similarity index 100% rename from include/DsrcArchive.h rename to include/dsrc/DsrcArchive.h diff --git a/include/DsrcModule.h b/include/dsrc/DsrcModule.h similarity index 100% rename from include/DsrcModule.h rename to include/dsrc/DsrcModule.h diff --git a/include/Fastq.h b/include/dsrc/Fastq.h similarity index 100% rename from include/Fastq.h rename to include/dsrc/Fastq.h diff --git a/include/FastqFile.h b/include/dsrc/FastqFile.h similarity index 100% rename from include/FastqFile.h rename to include/dsrc/FastqFile.h diff --git a/include/FastqRecord.h b/include/dsrc/FastqRecord.h similarity index 100% rename from include/FastqRecord.h rename to include/dsrc/FastqRecord.h diff --git a/include/Globals.h b/include/dsrc/Globals.h similarity index 100% rename from include/Globals.h rename to include/dsrc/Globals.h diff --git a/py/Interface.cpp b/py/Interface.cpp index eed80e9..fab4472 100644 --- a/py/Interface.cpp +++ b/py/Interface.cpp @@ -19,11 +19,11 @@ #include -#include "../include/Globals.h" -#include "../include/FastqRecord.h" -#include "../include/FastqFile.h" -#include "../include/DsrcModule.h" -#include "../include/DsrcArchive.h" +#include "../include/dsrc/Globals.h" +#include "../include/dsrc/FastqRecord.h" +#include "../include/dsrc/FastqFile.h" +#include "../include/dsrc/DsrcModule.h" +#include "../include/dsrc/DsrcArchive.h" namespace dsrc { diff --git a/py/Jamroot b/py/Jamroot index 8f8e34c..0dc9718 100644 --- a/py/Jamroot +++ b/py/Jamroot @@ -3,17 +3,19 @@ # import python ; - -# User-specified path to the Boost project +# +# Important! +# +# To compile DSRC Python module please specify your boost installation directory below +# use-project boost - : /home/andrzej/dev/lib/boost_1_49_0/ ; + : /absolute/path/to/user/boost/directory/ ; # Project-wide requirements project - : requirements /boost/python//boost_python /boost/thread//boost_thread ; - + : requirements /boost/python//boost_python /boost/thread//boost_thread /boost/thread//boost_system ; # Extension modules python-extension pydsrc diff --git a/src/BitMemory.h b/src/BitMemory.h index 94d7aea..f86e3e0 100644 --- a/src/BitMemory.h +++ b/src/BitMemory.h @@ -10,7 +10,7 @@ #ifndef H_BITMEMORY #define H_BITMEMORY -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include #include diff --git a/src/BlockCompressor.h b/src/BlockCompressor.h index e7c3cc9..6c366a4 100644 --- a/src/BlockCompressor.h +++ b/src/BlockCompressor.h @@ -10,7 +10,7 @@ #ifndef H_BLOCKCOMPRESSOR #define H_BLOCKCOMPRESSOR -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/BlockCompressorExt.h b/src/BlockCompressorExt.h index 86e9ef2..72a8218 100644 --- a/src/BlockCompressorExt.h +++ b/src/BlockCompressorExt.h @@ -10,8 +10,8 @@ #ifndef BLOCKCOMPRESSOREXT_H #define BLOCKCOMPRESSOREXT_H -#include "../include/Globals.h" -#include "../include/FastqRecord.h" +#include "../include/dsrc/Globals.h" +#include "../include/dsrc/FastqRecord.h" #include "BlockCompressor.h" diff --git a/src/Buffer.h b/src/Buffer.h index 5fd18a4..bbd0f94 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -10,7 +10,7 @@ #ifndef BUFFER_H #define BUFFER_H -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/Common.h b/src/Common.h index 773231b..f4e4764 100644 --- a/src/Common.h +++ b/src/Common.h @@ -10,7 +10,7 @@ #ifndef H_COMMON #define H_COMMON -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #ifndef NDEBUG # define DEBUG 1 diff --git a/src/Configurable.cpp b/src/Configurable.cpp index a4d72ce..ab00f19 100644 --- a/src/Configurable.cpp +++ b/src/Configurable.cpp @@ -10,7 +10,7 @@ #ifndef CPP_CONFIGURABLE #define CPP_CONFIGURABLE -#include "../include/Configurable.h" +#include "../include/dsrc/Configurable.h" #include "Common.h" diff --git a/src/Crc32.h b/src/Crc32.h index 20590a4..f7e1191 100644 --- a/src/Crc32.h +++ b/src/Crc32.h @@ -10,7 +10,7 @@ #ifndef CRC32_H #define CRC32_H -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include #include diff --git a/src/DataPool.h b/src/DataPool.h index 8c12df7..4486733 100644 --- a/src/DataPool.h +++ b/src/DataPool.h @@ -10,7 +10,7 @@ #ifndef H_DATA_POOL #define H_DATA_POOL -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/DataQueue.h b/src/DataQueue.h index b70fb89..70a9071 100644 --- a/src/DataQueue.h +++ b/src/DataQueue.h @@ -10,7 +10,7 @@ #ifndef H_DATAQUEUE #define H_DATAQUEUE -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/DataStream.h b/src/DataStream.h index ef77d62..4bb6ec0 100644 --- a/src/DataStream.h +++ b/src/DataStream.h @@ -10,7 +10,7 @@ #ifndef H_DATASTREAM #define H_DATASTREAM -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" namespace dsrc { diff --git a/src/DnaModeler.h b/src/DnaModeler.h index e01b190..87fe54a 100644 --- a/src/DnaModeler.h +++ b/src/DnaModeler.h @@ -10,7 +10,7 @@ #ifndef H_DNAMODELER #define H_DNAMODELER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Common.h" diff --git a/src/DnaModelerBasicB2.h b/src/DnaModelerBasicB2.h index a2337f5..7f73cd9 100644 --- a/src/DnaModelerBasicB2.h +++ b/src/DnaModelerBasicB2.h @@ -10,7 +10,7 @@ #ifndef H_DNAMODELERBASICB2 #define H_DNAMODELERBASICB2 -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DnaModeler.h" #include "Stats.h" diff --git a/src/DnaModelerHuffman.h b/src/DnaModelerHuffman.h index 2277125..7996cb6 100644 --- a/src/DnaModelerHuffman.h +++ b/src/DnaModelerHuffman.h @@ -1,7 +1,7 @@ #ifndef DNAMODELHUFFMAN_H #define DNAMODELHUFFMAN_H -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DnaModeler.h" #include "Stats.h" diff --git a/src/DnaModelerProxy.h b/src/DnaModelerProxy.h index a38007f..01ee837 100644 --- a/src/DnaModelerProxy.h +++ b/src/DnaModelerProxy.h @@ -10,7 +10,7 @@ #ifndef H_DNAMODELERPROXY #define H_DNAMODELERPROXY -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Stats.h" #include "DnaModelerBasicB2.h" diff --git a/src/DnaModelerRCO.h b/src/DnaModelerRCO.h index 983c06e..84310f0 100644 --- a/src/DnaModelerRCO.h +++ b/src/DnaModelerRCO.h @@ -10,7 +10,7 @@ #ifndef H_DNAMODELRCO #define H_DNAMODELRCO -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DnaModeler.h" #include "Fastq.h" diff --git a/src/DsrcArchive.cpp b/src/DsrcArchive.cpp index 5ba2d2a..1f81499 100644 --- a/src/DsrcArchive.cpp +++ b/src/DsrcArchive.cpp @@ -7,7 +7,7 @@ Version: 2.00 */ -#include "../include/DsrcArchive.h" +#include "../include/dsrc/DsrcArchive.h" #include "BlockCompressorExt.h" #include "DsrcFile.h" diff --git a/src/DsrcFile.h b/src/DsrcFile.h index f5ced58..7b13e2a 100644 --- a/src/DsrcFile.h +++ b/src/DsrcFile.h @@ -9,7 +9,7 @@ #ifndef H_DSRCFILE #define H_DSRCFILE -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/DsrcIo.h b/src/DsrcIo.h index 1de4b23..f8bedde 100644 --- a/src/DsrcIo.h +++ b/src/DsrcIo.h @@ -10,7 +10,7 @@ #ifndef H_DSRCWRITER #define H_DSRCWRITER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Buffer.h" #include "DataQueue.h" diff --git a/src/DsrcModule.cpp b/src/DsrcModule.cpp index ee2fba9..c663e00 100644 --- a/src/DsrcModule.cpp +++ b/src/DsrcModule.cpp @@ -7,7 +7,7 @@ Version: 2.00 */ -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include @@ -19,7 +19,7 @@ namespace th = boost; namespace th = std; #endif -#include "../include/DsrcModule.h" +#include "../include/dsrc/DsrcModule.h" #include "DsrcOperator.h" diff --git a/src/DsrcOperator.h b/src/DsrcOperator.h index fa40b08..a0da54e 100644 --- a/src/DsrcOperator.h +++ b/src/DsrcOperator.h @@ -10,7 +10,7 @@ #ifndef H_DSRCOPERATOR #define H_DSRCOPERATOR -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/DsrcWorker.cpp b/src/DsrcWorker.cpp index 05715d9..29a8a65 100644 --- a/src/DsrcWorker.cpp +++ b/src/DsrcWorker.cpp @@ -7,7 +7,7 @@ Version: 2.00 */ -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DsrcWorker.h" #include "DsrcIo.h" diff --git a/src/DsrcWorker.h b/src/DsrcWorker.h index 6e0a86c..bd4ef5f 100644 --- a/src/DsrcWorker.h +++ b/src/DsrcWorker.h @@ -10,7 +10,7 @@ #ifndef H_DSRCWORKER #define H_DSRCWORKER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Fastq.h" #include "BitMemory.h" diff --git a/src/ErrorHandler.h b/src/ErrorHandler.h index 3808e22..48e53f8 100644 --- a/src/ErrorHandler.h +++ b/src/ErrorHandler.h @@ -10,7 +10,7 @@ #ifndef H_ERRORHANDLER #define H_ERRORHANDLER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #ifdef USE_BOOST_THREAD #include diff --git a/src/Fastq.h b/src/Fastq.h index 9b5e1e9..35e6cc9 100644 --- a/src/Fastq.h +++ b/src/Fastq.h @@ -10,7 +10,7 @@ #ifndef H_FASTQ_SRC #define H_FASTQ_SRC -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Common.h" #include diff --git a/src/FastqFile.cpp b/src/FastqFile.cpp index cae8958..0fbb077 100644 --- a/src/FastqFile.cpp +++ b/src/FastqFile.cpp @@ -7,7 +7,7 @@ Version: 2.00 */ -#include "../include/FastqFile.h" +#include "../include/dsrc/FastqFile.h" #include "Common.h" #include "Buffer.h" diff --git a/src/FastqIo.h b/src/FastqIo.h index a430f01..f6a1b7d 100644 --- a/src/FastqIo.h +++ b/src/FastqIo.h @@ -10,7 +10,7 @@ #ifndef H_FASTQREADER #define H_FASTQREADER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Common.h" #include "Fastq.h" diff --git a/src/FastqParser.h b/src/FastqParser.h index 8f94a70..9164723 100644 --- a/src/FastqParser.h +++ b/src/FastqParser.h @@ -10,7 +10,7 @@ #ifndef H_FASTQPARSER #define H_FASTQPARSER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Common.h" #include "Fastq.h" diff --git a/src/FastqStream.h b/src/FastqStream.h index a75b9d5..b529c4a 100644 --- a/src/FastqStream.h +++ b/src/FastqStream.h @@ -9,7 +9,7 @@ #ifndef H_FASTQSTREAM #define H_FASTQSTREAM -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" //#include "Common.h" #include "Fastq.h" diff --git a/src/FileStream.h b/src/FileStream.h index 1742010..6bca51f 100644 --- a/src/FileStream.h +++ b/src/FileStream.h @@ -9,7 +9,7 @@ #ifndef H_FILESTREAM #define H_FILESTREAM -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DataStream.h" diff --git a/src/Makefile b/src/Makefile index 935c4ca..dcb68c4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ all: bin lib -INC_DIR = ../include +INC_DIR = ../include/dsrc SRC_DIR = . LIB_DIR = ../lib BIN_DIR = ../bin diff --git a/src/QualityEncoder.h b/src/QualityEncoder.h index f19f276..0b046ce 100644 --- a/src/QualityEncoder.h +++ b/src/QualityEncoder.h @@ -10,7 +10,7 @@ #ifndef H_QUALITYENCODER #define H_QUALITYENCODER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "RangeCoder.h" #include "SymbolCoderRC.h" diff --git a/src/QualityModeler.h b/src/QualityModeler.h index d0a8c9f..1eb4561 100644 --- a/src/QualityModeler.h +++ b/src/QualityModeler.h @@ -1,7 +1,7 @@ #ifndef QUALITYMODELER_H #define QUALITYMODELER_H -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Common.h" #include "RecordsProcessor.h" diff --git a/src/QualityModelerProxy.h b/src/QualityModelerProxy.h index 38a3a54..9adc795 100644 --- a/src/QualityModelerProxy.h +++ b/src/QualityModelerProxy.h @@ -10,7 +10,7 @@ #ifndef H_QUALITYMODELERPROXY #define H_QUALITYMODELERPROXY -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Fastq.h" #include "QualityModeler.h" diff --git a/src/QualityOrderModeler.h b/src/QualityOrderModeler.h index 1abfb30..323bced 100644 --- a/src/QualityOrderModeler.h +++ b/src/QualityOrderModeler.h @@ -9,7 +9,7 @@ #ifndef H_QUALITYORDERMODELER #define H_QUALITYORDERMODELER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "QualityEncoder.h" #include "Fastq.h" diff --git a/src/QualityPositionModeler.h b/src/QualityPositionModeler.h index 539235f..41f6ac3 100644 --- a/src/QualityPositionModeler.h +++ b/src/QualityPositionModeler.h @@ -10,7 +10,7 @@ #ifndef H_QUALITYPOSITIONMODELER #define H_QUALITYPOSITIONMODELER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "QualityModeler.h" #include "SymbolCoderRC.h" diff --git a/src/QualityRLEModeler.h b/src/QualityRLEModeler.h index d6fd695..45d1de9 100644 --- a/src/QualityRLEModeler.h +++ b/src/QualityRLEModeler.h @@ -10,7 +10,7 @@ #ifndef H_QUALITYRLEMODELER #define H_QUALITYRLEMODELER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "Fastq.h" #include "QualityModeler.h" diff --git a/src/RangeCoder.h b/src/RangeCoder.h index f3739fa..9bfebaa 100644 --- a/src/RangeCoder.h +++ b/src/RangeCoder.h @@ -10,7 +10,7 @@ #ifndef H_RANGECODER #define H_RANGECODER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "BitMemory.h" diff --git a/src/RecordsProcessor.h b/src/RecordsProcessor.h index c778385..4b1bae5 100644 --- a/src/RecordsProcessor.h +++ b/src/RecordsProcessor.h @@ -10,7 +10,7 @@ #ifndef H_RECORDSPROCESSOR #define H_RECORDSPROCESSOR -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/Stats.h b/src/Stats.h index c489df3..f983b3f 100644 --- a/src/Stats.h +++ b/src/Stats.h @@ -10,7 +10,7 @@ #ifndef H_STATS #define H_STATS -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include diff --git a/src/StdStream.h b/src/StdStream.h index 2a3e797..7ee6b6d 100644 --- a/src/StdStream.h +++ b/src/StdStream.h @@ -10,7 +10,7 @@ #ifndef H_STDSTREAM #define H_STDSTREAM -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "DataStream.h" diff --git a/src/SymbolCoderRC.h b/src/SymbolCoderRC.h index f896f0b..12966c8 100644 --- a/src/SymbolCoderRC.h +++ b/src/SymbolCoderRC.h @@ -10,7 +10,7 @@ #ifndef H_SYMBOLCODERRC #define H_SYMBOLCODERRC -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "RangeCoder.h" diff --git a/src/TagModeler.h b/src/TagModeler.h index 524795a..51a3123 100644 --- a/src/TagModeler.h +++ b/src/TagModeler.h @@ -10,7 +10,7 @@ #ifndef H_TAGMODELER #define H_TAGMODELER -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include #include diff --git a/src/dsrc20-vs2k10.vcxproj b/src/dsrc20-vs2k10.vcxproj index 1e88d1d..9932a48 100644 --- a/src/dsrc20-vs2k10.vcxproj +++ b/src/dsrc20-vs2k10.vcxproj @@ -225,32 +225,32 @@ - + true true - + true true - + true true - + true true - + true true - + true true - + true true diff --git a/src/dsrc20-vs2k10.vcxproj.filters b/src/dsrc20-vs2k10.vcxproj.filters index 8e87825..d8da830 100644 --- a/src/dsrc20-vs2k10.vcxproj.filters +++ b/src/dsrc20-vs2k10.vcxproj.filters @@ -203,25 +203,25 @@ Header Files - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib diff --git a/src/dsrc20-vs2k12.vcxproj b/src/dsrc20-vs2k12.vcxproj index f7ccd93..8207845 100644 --- a/src/dsrc20-vs2k12.vcxproj +++ b/src/dsrc20-vs2k12.vcxproj @@ -228,32 +228,32 @@ - + true true - + true true - + true true - + true true - + true true - + true true - + true true diff --git a/src/dsrc20-vs2k12.vcxproj.filters b/src/dsrc20-vs2k12.vcxproj.filters index 8e87825..d8da830 100644 --- a/src/dsrc20-vs2k12.vcxproj.filters +++ b/src/dsrc20-vs2k12.vcxproj.filters @@ -203,25 +203,25 @@ Header Files - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib - + Header Files\lib diff --git a/src/dsrc20.pro b/src/dsrc20.pro index 501c33d..cb7e032 100644 --- a/src/dsrc20.pro +++ b/src/dsrc20.pro @@ -84,12 +84,12 @@ HEADERS += \ HEADERS += \ BlockCompressorExt.h \ - ../include/Configurable.h \ - ../include/DsrcArchive.h \ - ../include/FastqFile.h \ - ../include/DsrcModule.h \ - ../include/Dsrc.h \ - ../include/Globals.h \ - ../include/FastqRecord.h + ../dsrc/include/Configurable.h \ + ../dsrc/include/DsrcArchive.h \ + ../dsrc/include/FastqFile.h \ + ../dsrc/include/DsrcModule.h \ + ../dsrc/include/Dsrc.h \ + ../dsrc/include/Globals.h \ + ../dsrc/include/FastqRecord.h #LIBS += -lboost_python -lpython2.7 diff --git a/src/huffman.h b/src/huffman.h index 3d1e0e2..fdb4930 100644 --- a/src/huffman.h +++ b/src/huffman.h @@ -11,7 +11,7 @@ #ifndef _HUFFMAN_H #define _HUFFMAN_H -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include "BitMemory.h" diff --git a/src/main.cpp b/src/main.cpp index 9a6abdc..ee17cfb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,7 @@ Version: 2.00 */ -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include #include diff --git a/src/utils.h b/src/utils.h index ffc4861..51cf09b 100644 --- a/src/utils.h +++ b/src/utils.h @@ -10,7 +10,7 @@ #ifndef H_UTILS #define H_UTILS -#include "../include/Globals.h" +#include "../include/dsrc/Globals.h" #include #include