set svn end of lines to native

4 files changed, 103 insertions, 103 deletions

diff --git a/intern/smoke/intern/Makefile.FFT b/intern/smoke/intern/Makefile.FFT
index e45af1df29b..7e9d089cec2 100644
--- a/intern/smoke/intern/Makefile.FFT
+++ b/intern/smoke/intern/Makefile.FFT
@@ -1,22 +1,22 @@
-# common stuff

-LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng

-CFLAGS_COMMON =  -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32

-

-CC         = g++

-CFLAGS     = ${CFLAGS_COMMON} -O3 -Wno-unused

-LDFLAGS    = ${LDFLAGS_COMMON}

-EXECUTABLE = noiseFFT

-

-SOURCES    = noiseFFT.cpp

-OBJECTS    = $(SOURCES:.cpp=.o)

-

-all: $(SOURCES) $(EXECUTABLE)

-	

-$(EXECUTABLE): $(OBJECTS) 

-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

-

-.cpp.o:

-	$(CC) $(CFLAGS) $< -o $@

-

-clean:

-	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)

+# common stuff
+LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng
+CFLAGS_COMMON =  -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32
+
+CC         = g++
+CFLAGS     = ${CFLAGS_COMMON} -O3 -Wno-unused
+LDFLAGS    = ${LDFLAGS_COMMON}
+EXECUTABLE = noiseFFT
+
+SOURCES    = noiseFFT.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+	
+$(EXECUTABLE): $(OBJECTS) 
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+clean:
+	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
diff --git a/intern/smoke/intern/Makefile.cygwin b/intern/smoke/intern/Makefile.cygwin
index c93753a67fe..2a747219554 100644
--- a/intern/smoke/intern/Makefile.cygwin
+++ b/intern/smoke/intern/Makefile.cygwin
@@ -1,23 +1,23 @@
-CC         = g++

-LDFLAGS    = -lz -lpng

-CFLAGS     =  -O3 -Wno-unused -c -Wall -I./ -D_WIN32

-EXECUTABLE = FLUID_3D

-

-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp

-OBJECTS    = $(SOURCES:.cpp=.o)

-

-all: $(SOURCES) $(EXECUTABLE)

-	

-$(EXECUTABLE): $(OBJECTS) 

-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

-

-.cpp.o:

-	$(CC) $(CFLAGS) $< -o $@

-

-SPHERE.o: SPHERE.h

-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp

-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp

-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp

-

-clean:

-	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)

+CC         = g++
+LDFLAGS    = -lz -lpng
+CFLAGS     =  -O3 -Wno-unused -c -Wall -I./ -D_WIN32
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+	
+$(EXECUTABLE): $(OBJECTS) 
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
diff --git a/intern/smoke/intern/Makefile.linux b/intern/smoke/intern/Makefile.linux
index 8e71af465dd..5fbb6e6c3e3 100644
--- a/intern/smoke/intern/Makefile.linux
+++ b/intern/smoke/intern/Makefile.linux
@@ -1,23 +1,23 @@
-CC         = g++

-LDFLAGS    = -lz -lpng -fopenmp -lgomp

-CFLAGS     =  -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused

-EXECUTABLE = FLUID_3D

-

-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp

-OBJECTS    = $(SOURCES:.cpp=.o)

-

-all: $(SOURCES) $(EXECUTABLE)

-	

-$(EXECUTABLE): $(OBJECTS) 

-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

-

-.cpp.o:

-	$(CC) $(CFLAGS) $< -o $@

-

-SPHERE.o: SPHERE.h

-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp

-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp

-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp

-

-clean:

-	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)

+CC         = g++
+LDFLAGS    = -lz -lpng -fopenmp -lgomp
+CFLAGS     =  -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+	
+$(EXECUTABLE): $(OBJECTS) 
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
diff --git a/intern/smoke/intern/Makefile.mac b/intern/smoke/intern/Makefile.mac
index 227aaa10a16..d0b7bd38c85 100644
--- a/intern/smoke/intern/Makefile.mac
+++ b/intern/smoke/intern/Makefile.mac
@@ -1,35 +1,35 @@
-CC         = g++

-

-# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP

-#OPENMP_FLAGS = -fopenmp   -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include

-#OPENMPLD_FLAGS = -fopenmp  -lgomp -I/opt/gcc-4.3/usr/local/lib

-OPENMP_FLAGS = 

-OPENMPLD_FLAGS = 

-

-# assumes MacPorts libpng installation

-PNG_INCLUDE =  -I/opt/local/include  

-PNG_LIBS =  -I/opt/local/lib  

-

-LDFLAGS    =  $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS)

-CFLAGS     =  -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused

-EXECUTABLE = FLUID_3D

-

-SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp

-OBJECTS    = $(SOURCES:.cpp=.o)

-

-all: $(SOURCES) $(EXECUTABLE)

-	

-$(EXECUTABLE): $(OBJECTS) 

-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@

-

-.cpp.o:

-	$(CC) $(CFLAGS) $< -o $@

-

-SPHERE.o: SPHERE.h

-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp

-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp

-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp

-

-clean:

-	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)

-

+CC         = g++
+
+# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP
+#OPENMP_FLAGS = -fopenmp   -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include
+#OPENMPLD_FLAGS = -fopenmp  -lgomp -I/opt/gcc-4.3/usr/local/lib
+OPENMP_FLAGS = 
+OPENMPLD_FLAGS = 
+
+# assumes MacPorts libpng installation
+PNG_INCLUDE =  -I/opt/local/include  
+PNG_LIBS =  -I/opt/local/lib  
+
+LDFLAGS    =  $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS)
+CFLAGS     =  -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused
+EXECUTABLE = FLUID_3D
+
+SOURCES    = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
+OBJECTS    = $(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(EXECUTABLE)
+	
+$(EXECUTABLE): $(OBJECTS) 
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+SPHERE.o: SPHERE.h
+FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
+FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
+main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
+
+clean:
+	rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
+