Merging r36529-38806bge_components

1 files changed, 23 insertions, 23 deletions

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)