Added headers to appease gcc on linux and updated Makefile.

Aborted atttempt at setting up the cross-compiler for Ubuntu-->Windows
mrkrause · Jul 3, 2015 · af7f8f5 · af7f8f5
1 parent 1f53536
commit af7f8f5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/Makefile b/Makefile
diff --git a/Makefile b/Makefile
@@ -0,0 +1,18 @@
+MATLAB_ROOT=/usr/local/MATLAB/R2015a/
+CC=$(MATLAB_ROOT)/bin/mex
+CFLAGS=-client engine -g -DMAT_FILE_SUPPORT
+LIBS=-lFLAC -lFLAC++ -lboost_program_options -lboost_filesystem -lboost_system
+TARGET = rippleToFlac
+DEPS = NSxFile.h Config.h MatFile.h
+OBJ = typeHelper.o MatFile.o Config.o NSxFile.o NSxChannel.o NSxHeader.o nsx2mat.o nsx2txt.o rippleToFlac.o
+
+
+%.o: %.cpp $(DEPS)
+	$(CC) -c $@ $< $(CFLAGS)
+
+rippleToFlac: $(OBJ)
+	$(CC) -output $@ $^ $(CFLAGS) $(LIBS)
+
+.PHONY: clean
+clean:
+	rm -f *.o *~ core
diff --git a/Makefile.win b/Makefile.win
@@ -1,4 +1,4 @@
-CC=i686-pc-mingw32-g++
+CC=x86_64-w64-mingw32-g++
 CFLAGS= -O3 -Wall -Werror -std=gnu++11
 LIBS=-logg -lFLAC -logg -lFLAC++ -logg -lFLAC -logg -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt
 TARGET = rippleToFlac

diff --git a/NSxFile.h b/NSxFile.h
@@ -19,7 +19,7 @@
 
 #include "Config.h"
 #ifdef MAT_FILE_SUPPORT
-#include "matFile.h"
+#include "MatFile.h"
 #endif
 
 class NSxFile {

diff --git a/typeHelper.h b/typeHelper.h
@@ -9,7 +9,9 @@
 #ifndef _typeHelper_h
 #define _typeHelper_h
 
+#include <typeinfo>
 #include <string>
+#include <stdexcept>
 #include <exception>
 #include <iostream>
 #include <cstdint>