Merge pull request #145 from rordenlab/SieXA10_Phi5dMRI

Please pull SieXA10_Phi5dMRI into master
rordenlab · Dec 13, 2017 · 3661eb5 · 3661eb5
2 parents e35a1f1 + 304d7ad
commit 3661eb5
Show file tree

Hide file tree

Showing 4 changed files with 454 additions and 95 deletions.
diff --git a/console/makefile b/console/makefile
@@ -1,9 +1,14 @@
-CFLAGS=-s
+# Regular use
+CFLAGS=-s -O3
+
+# Debugging
+#CFLAGS=-g
+
 ifneq ($(OS),Windows_NT)
 	OS = $(shell uname)
  	ifeq "$(OS)" "Darwin"
-		CFLAGS=-dead_strip
+		CFLAGS=-dead_strip -O3
 	endif
 endif
 all:
-	g++ $(CFLAGS) -O3 -I. main_console.cpp nii_foreign.cpp nii_dicom.cpp jpg_0XC3.cpp ujpeg.cpp nifti1_io_core.cpp nii_ortho.cpp nii_dicom_batch.cpp  -o dcm2niix -DmyDisableOpenJPEG
+	g++ $(CFLAGS) -I. main_console.cpp nii_foreign.cpp nii_dicom.cpp jpg_0XC3.cpp ujpeg.cpp nifti1_io_core.cpp nii_ortho.cpp nii_dicom_batch.cpp  -o dcm2niix -DmyDisableOpenJPEG