Commit bdf1c590 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.41.0.pre-release

parent 4e6744bc
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
# USEBOOST - link with boost libraries. Must install boost. Allows the make.contigs command to read .gz files.
# BOOST_LIBRARY_DIR - location of boost libraries
# BOOST_INCLUDE_DIR - location of boost include files
# MOTHUR_FILES - default location for mothur to look for input files at runtime. Most often used for reference files.
# MOTHUR_FILES - The MOTHUR_FILES parameter is optional, but allows you to set a default location for mothur to look for input files it can't find. This is often used for reference files you want to store in one location separate from your data.

PREFIX := ${CURDIR} 

@@ -25,7 +25,7 @@ LOGFILE_NAME ?= yes
BOOST_LIBRARY_DIR="\"Enter_your_boost_library_path_here\""
BOOST_INCLUDE_DIR="\"Enter_your_boost_include_path_here\""
MOTHUR_FILES="\"Enter_your_default_path_here\""
VERSION = "\"1.40.4\""
VERSION = "\"1.41.0\""

ifeq  ($(strip $(64BIT_VERSION)),yes)
    CXXFLAGS += -DBIT_VERSION
@@ -40,7 +40,7 @@ ifeq ($(strip $(OPTIMIZE)),yes)
    CXXFLAGS += -O3
endif

CXXFLAGS += -std=c++11 -DVERSION=${VERSION}
CXXFLAGS += -std=c++11 -pthread -DVERSION=${VERSION}
LDFLAGS += -std=c++11 -pthread

ifeq  ($(strip $(MOTHUR_FILES)),"\"Enter_your_default_path_here\"")
+170 −117

File changed.

Preview size limit exceeded, changes collapsed.

+843 −0

File added.

Preview size limit exceeded, changes collapsed.

+31 −0
Original line number Diff line number Diff line
//
//  454sop.hpp
//  Mothur
//
//  Created by Sarah Westcott on 8/17/18.
//  Copyright © 2018 Schloss Lab. All rights reserved.
//

#ifndef _54sop_hpp
#define _54sop_hpp

#include "gtest/gtest.h"
#include "command.hpp"


class Test454SOP  {
    
    
public:
    
    Test454SOP();
    ~Test454SOP();
    
    string inputDir, outputDir, setDirInputs;
    CurrentFile* current;
    MothurOut* m;
    
};


#endif /* _54sop_hpp */
+681 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading