Skip to content
Snippets Groups Projects
Commit 19f7c726 authored by Aaron's avatar Aaron
Browse files

Removed -m64 from Makefiles.

parent ff4db941
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 15 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
CXX= g++ CXX= g++
CXXFLAGS= -Wall -O3 -m64 CXXFLAGS= -Wall -O3
LIBS= -lz LIBS= -lz
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
OBJ_DIR = ../../obj/ OBJ_DIR = ../../obj/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
LIBFLAGS = -lc LIBFLAGS = -lc
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX= g++ CXX= g++
CXXFLAGS= -Wall -O3 -m64 CXXFLAGS= -Wall -O3
LIBS= -lz LIBS= -lz
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
OBJ_DIR = ../../obj/ OBJ_DIR = ../../obj/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
LIBS= -lz LIBS= -lz
......
...@@ -194,7 +194,7 @@ bool BedIntersectPE::FindOneOrMoreOverlaps(BEDPE &a, vector<BED> &hits1, vector< ...@@ -194,7 +194,7 @@ bool BedIntersectPE::FindOneOrMoreOverlaps(BEDPE &a, vector<BED> &hits1, vector<
// is there enough overlap relative to the user's request? (default ~ 1bp) // is there enough overlap relative to the user's request? (default ~ 1bp)
if ( ( (float) overlapBases / (float) aLength ) >= this->overlapFraction ) { if ( ( (float) overlapBases / (float) aLength ) >= this->overlapFraction ) {
numOverlapsEnd1++; numOverlapsEnd2++;
if (type == "either") return true; if (type == "either") return true;
else { else {
...@@ -205,7 +205,7 @@ bool BedIntersectPE::FindOneOrMoreOverlaps(BEDPE &a, vector<BED> &hits1, vector< ...@@ -205,7 +205,7 @@ bool BedIntersectPE::FindOneOrMoreOverlaps(BEDPE &a, vector<BED> &hits1, vector<
// Now report the hits depending on what the user has requested. // Now report the hits depending on what the user has requested.
if (type == "neither") { if (type == "neither") {
if ( (numOverlapsEnd1 == 0) && (numOverlapsEnd2 == 0) ) return false; if ( (numOverlapsEnd1 == 0) && (numOverlapsEnd2 == 0) ) return true;
} }
else if (type == "xor") { else if (type == "xor") {
if ( (numOverlapsEnd1 > 0) && (numOverlapsEnd2 == 0) ) return true; if ( (numOverlapsEnd1 > 0) && (numOverlapsEnd2 == 0) ) return true;
...@@ -441,7 +441,7 @@ void BedIntersectPE::IntersectBamPE(string bamFile) { ...@@ -441,7 +441,7 @@ void BedIntersectPE::IntersectBamPE(string bamFile) {
else if (this->searchType == "neither") { else if (this->searchType == "neither") {
if (this->bamOutput == true) { if (this->bamOutput == true) {
overlapsFound = FindOneOrMoreOverlaps(a, hits1, hits2, this->searchType); overlapsFound = FindOneOrMoreOverlaps(a, hits1, hits2, this->searchType);
if (overlapsFound == false) { // write to BAM if not hits found if (overlapsFound == true) { // write to BAM if not hits found
writer.SaveAlignment(bam); writer.SaveAlignment(bam);
} }
} }
......
No preview for this file type
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -m64 CXXFLAGS = -O3 -Wall
LDFLAGS = LDFLAGS =
UTILITIES_DIR = ../utils/ UTILITIES_DIR = ../utils/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment