Skip to content

Commit

Permalink
updated compiler settings file. hopefully the same settings work on b…
Browse files Browse the repository at this point in the history
…oth mac and linux
jewettaij committed May 7, 2019
1 parent 2213ebf commit 7118598
Showing 6 changed files with 15 additions and 45 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)]

ndmansfield
===========

@@ -53,6 +55,7 @@ This program was originally used to generate initial coordinates for polymer mel
![coarse grained DNA polymer model](./doc/images/moltemplate_usage/CG_dsDNA_gold_turquoise.gif) ![coarse grained DNA polymer model](./doc/images/rightarrow.png) ![DNA wrapped around a curve. Color varies from blue to red.](./doc/images/moltemplate_usage/wrap_CG_dsDNA_around_a_curve_from_ndmansfield_LLR.png)

## Running Time

The total running time necessary to generate a random curve is
estimated to be O(n^2). (The number of iterations
necessary to generate a random curve was estimated
@@ -63,13 +66,15 @@ and were generated in a few minutes.

## Compilation

## Linux:
## Linux and Apple macOS:

cd src
source setup_gcc_linux.sh
source setup_gcc.sh
make

(If you are not using the bash shell, enter "bash" into the terminal beforehand)
(If you are not using the bash shell, enter "bash" into the terminal beforehand.
*Note: Apple users* will need to install the gcc compiler
and other build tools using Xcode or brew.)

## Windows 10:

@@ -80,11 +85,6 @@ Install the Windows Subsystem for Linux (WSL) and run
and then follow the instructions above for linux.
(Older windows users can install Cygwin or MinGW.)

## Apple:

cd src
source setup_gcc_OSX.sh
make

## Dimensionality:

2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ ndmansfield: $(OBJECT_FILES) $(LIB_FILES)
$(LIBS)


GENERATED_FILES = *.o *.a *.pure core ndmansfield
GENERATED_FILES = *.o *.a core ndmansfield

install:
$(MAKE) ANSI_C="$(ANSI_C)" ANSI_CPP="$(ANSI_CPP)" L_COMP="$(L_COMP)" CFLAGS="$(CFLAGS)" LFLAGS="$(LFLAGS)" INSTALL_PATH="$(INSTALL_PATH)" ndmansfield
6 changes: 3 additions & 3 deletions src/setup_gcc_linux_dbg.sh → src/setup_gcc.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ export ANSI_C="gcc"
export ANSI_CPP="g++"
export L_COMP="ar rs"

export LFLAGS="-static"
export LFLAGS=""
#export LFLAGS="-static" <- using "-static" linker flag causes trouble with macs

export MY_FLAGS="-std=c++11 -g -O0"
export MY_FLAGS="-std=c++11 -O3 -DNDEBUG -ffast-math"
export CFLAGS="-c $MY_FLAGS"
export CPP_PRELINKER_COMMAND="echo"
export COMPILER_TEMP_FILES=""
export LINKER_TEMP_FILES=""

5 changes: 3 additions & 2 deletions src/setup_gcc_linux.sh → src/setup_gcc_dbg.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -4,9 +4,10 @@ export ANSI_C="gcc"
export ANSI_CPP="g++"
export L_COMP="ar rs"

export LFLAGS="-static"
export LFLAGS=""
#export LFLAGS="-static" <- using "-static" linker flag causes trouble with macs

export MY_FLAGS="-std=c++11 -O3 -DNDEBUG -ffast-math -finline-functions"
export MY_FLAGS="-std=c++11 -g3 -O0"
export CFLAGS="-c $MY_FLAGS"
export CPP_PRELINKER_COMMAND="echo"
export COMPILER_TEMP_FILES=""
15 changes: 0 additions & 15 deletions src/setup_gcc_mac.sh

This file was deleted.

16 changes: 0 additions & 16 deletions src/setup_gcc_mac_dbg.sh

This file was deleted.

0 comments on commit 7118598

Please sign in to comment.