set svn end of lines to native

11 files changed, 749 insertions, 749 deletions

diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
index 4474eaa5d90..aaa45273845 100644
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
@@ -1,126 +1,126 @@
-# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=BSP_GhostTest - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "BSP_GhostTest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x413 /d "NDEBUG"

-# ADD RSC /l 0x413 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"

-

-!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x413 /d "_DEBUG"

-# ADD RSC /l 0x413 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "BSP_GhostTest - Win32 Release"

-# Name "BSP_GhostTest - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\BSP_GhostTest3D.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_GhostTest3D.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_MeshDrawer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_MeshDrawer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_PlyLoader.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_PlyLoader.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BSP_TMesh.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ply.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\plyfile.c

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="BSP_GhostTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=BSP_GhostTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "BSP_GhostTest.mak" CFG="BSP_GhostTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "BSP_GhostTest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "BSP_GhostTest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "BSP_GhostTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x413 /d "NDEBUG"
+# ADD RSC /l 0x413 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ELSEIF  "$(CFG)" == "BSP_GhostTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../extern/" /I "../../../../lib/windows/string/include" /I "../../../../lib/windows/ghost/include" /I "../../../../lib/windows/moto/include" /I "../../../../lib/windows/memutil/include" /I "../../../../lib/windows/container/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x413 /d "_DEBUG"
+# ADD RSC /l 0x413 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\glut-3.7\lib\\"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "BSP_GhostTest - Win32 Release"
+# Name "BSP_GhostTest - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_GhostTest3D.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_MeshDrawer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_PlyLoader.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BSP_TMesh.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ply.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\plyfile.c
+# End Source File
+# End Target
+# End Project
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
index 0d9ca3d2b08..802fba84bef 100644
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
@@ -1,125 +1,125 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name bsplib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ghost

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name string

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name MoTo

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name container

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name memutil

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name MoTo

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name memutil

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "BSP_GhostTest"=.\BSP_GhostTest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name bsplib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ghost
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name string
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "MoTo"=..\..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bsplib"=..\..\make\msvc6_0\bsplib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name container
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MoTo
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "container"=..\..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name memutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ghost"=..\..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "memutil"=..\..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "string"=..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
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)
+
diff --git a/release/environment-mswindows b/release/environment-mswindows
index f8890f89af8..41308533e0b 100644
--- a/release/environment-mswindows
+++ b/release/environment-mswindows
@@ -1,18 +1,18 @@
-# This is a Blender Environment Variable config file.

-#

-# Comment lines start with "#", other lines will be split at the "="

-# and the part before will be used as env var name and the part after

-# as env var value. The value can make reference to previous or

-# prelaunch variables with "%%" and the content will be replaced.

-# Once set, values of variables will not be overwritten.

-#

-# BLENDER_SHARE should be COMMON_APPDATA\\Blender Foundation\\Blender for typical installs.

-# BLENDER_VERSION will be set by the program before processing this file.

-BLENDER_USER_BASE=%USERPROFILE%\\Blender Foundation\\Blender\\%BLENDER_VERSION%

-BLENDER_SYSTEM_BASE=%BLENDER_SHARE%\\%BLENDER_VERSION%

-BLENDER_USER_DATAFILES=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\datafiles

-BLENDER_SYSTEM_DATAFILES=%BLENDER_SHARE%\\%BLENDER_VERSION%\\datafiles

-BLENDER_USER_PY=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\py

-BLENDER_SYSTEM_PY=%BLENDER_SHARE%\\%BLENDER_VERSION%\\py

-BLENDER_USER_PLUGINS=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\plugins

-BLENDER_SYSTEM_PLUGINS=%BLENDER_SHARE%\\%BLENDER_VERSION%\\plugins

+# This is a Blender Environment Variable config file.
+#
+# Comment lines start with "#", other lines will be split at the "="
+# and the part before will be used as env var name and the part after
+# as env var value. The value can make reference to previous or
+# prelaunch variables with "%%" and the content will be replaced.
+# Once set, values of variables will not be overwritten.
+#
+# BLENDER_SHARE should be COMMON_APPDATA\\Blender Foundation\\Blender for typical installs.
+# BLENDER_VERSION will be set by the program before processing this file.
+BLENDER_USER_BASE=%USERPROFILE%\\Blender Foundation\\Blender\\%BLENDER_VERSION%
+BLENDER_SYSTEM_BASE=%BLENDER_SHARE%\\%BLENDER_VERSION%
+BLENDER_USER_DATAFILES=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\datafiles
+BLENDER_SYSTEM_DATAFILES=%BLENDER_SHARE%\\%BLENDER_VERSION%\\datafiles
+BLENDER_USER_PY=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\py
+BLENDER_SYSTEM_PY=%BLENDER_SHARE%\\%BLENDER_VERSION%\\py
+BLENDER_USER_PLUGINS=%USERPROFILE%\\Blender Foundation\\%BLENDER_VERSION%\\plugins
+BLENDER_SYSTEM_PLUGINS=%BLENDER_SHARE%\\%BLENDER_VERSION%\\plugins
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 2a37f7f6ba6..03f62f0df48 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -1,261 +1,261 @@
-;

-; $Id$

-;

-; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)

-;

-

-SetCompressor /SOLID lzma

-

-Name "Blender [VERSION]" 

-

-RequestExecutionLevel admin

-

-!include "MUI.nsh"

-!include "WinVer.nsh"

-!include "FileFunc.nsh"

-!include "WordFunc.nsh"

-!include "nsDialogs.nsh"

-!include "x64.nsh"

-

-!define MUI_ABORTWARNING

-

-!define MUI_WELCOMEPAGE_TEXT  "This wizard will guide you through the installation of Blender. It is recommended that you close all other applications before starting Setup."

-!define MUI_WELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"

-!define MUI_HEADERIMAGE

-!define MUI_HEADERIMAGE_BITMAP  "[RELDIR]\00.header.bmp"

-!define MUI_COMPONENTSPAGE_SMALLDESC

-!define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe"

-!define MUI_CHECKBITMAP "[RELDIR]\00.checked.bmp"

-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"

-

-!insertmacro MUI_PAGE_WELCOME

-!insertmacro MUI_PAGE_LICENSE "[DISTDIR]\Copyright.txt"

-!insertmacro MUI_PAGE_COMPONENTS

-    

-!insertmacro MUI_PAGE_DIRECTORY

-Page custom DataLocation DataLocationOnLeave

-!insertmacro MUI_PAGE_INSTFILES

-!insertmacro MUI_PAGE_FINISH

-  

-!insertmacro MUI_UNPAGE_WELCOME

-!insertmacro MUI_UNPAGE_CONFIRM

-!insertmacro MUI_UNPAGE_INSTFILES

-!insertmacro MUI_UNPAGE_FINISH

-

-!insertmacro Locate

-!insertmacro VersionCompare

-

-

-Icon "[RELDIR]\00.installer.ico"

-UninstallIcon "[RELDIR]\00.installer.ico"

-

-;--------------------------------

-;Languages

- 

-  !insertmacro MUI_LANGUAGE "English"

-    

-;--------------------------------

-;Language Strings

-

-  ;Description

-  LangString DESC_InstallFiles ${LANG_ENGLISH} "Copy all required files to the application folder."

-  LangString DESC_StartMenu ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"

-  LangString DESC_DesktopShortcut ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."

-  LangString DESC_BlendRegister ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."

-  LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Specify User Data Location"

-;--------------------------------

-;Data

-

-Caption "Blender [VERSION] Installer"

-OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"

-InstallDir $INSTDIR ; $INSTDIR is set inside .onInit

-BrandingText "Blender Foundation | http://www.blender.org"

-ComponentText "This will install Blender [VERSION] on your computer."

-

-DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."

-

-SilentUnInstall normal

-

-Var BLENDERHOME

-Var SHORTVERSION ; This is blender_version_decimal() from path_util.c

-

-; Custom controls

-Var HWND

-

-Var HWND_APPDATA

-Var HWND_INSTDIR

-Var HWND_HOMEDIR

-

-Function .onInit

-  ClearErrors

-  StrCpy $SHORTVERSION "[SHORTVERSION]"

-

-  ${If} ${RunningX64}

-    ${If} "[BITNESS]" == "32"

-    ${OrIf} "[BITNESS]" == "-mingw"

-      StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section

-    ${ElseIf} "[BITNESS]" == "64"

-      StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender"

-    ${EndIf}

-  ${Else}

-    StrCpy $INSTDIR "$PROGRAMFILES\Blender Foundation\Blender"

-  ${EndIf}

-FunctionEnd

-

-Function un.onInit

-FunctionEnd

-

-Function DataLocation

-  nsDialogs::Create /NOUNLOAD 1018

-  Pop $HWND

-  

-  ${If} $HWND == error

-    Abort

-  ${EndIf}

-  

-  ${NSD_CreateLabel} 0 0 100% 24u "Please specify where you wish to install Blender's user data files. Be aware that if you choose to use your Application Data directory, your preferences and scripts will only be accessible by the current user account."

-  ${NSD_CreateRadioButton} 0 50 100% 12u "Use Application Data directory (recommended)"

-  Pop $HWND_APPDATA

-  ${NSD_CreateRadioButton} 0 80 100% 12u "Use installation directory"

-  Pop $HWND_INSTDIR

-  ${NSD_CreateRadioButton} 0 110 100% 12u "I have defined a %HOME% variable, please install files there"

-  Pop $HWND_HOMEDIR

-  

-  ${If} ${AtMostWinME}

-    GetDlgItem $0 $HWND $HWND_APPDATA

-    EnableWindow $0 0

-    SendMessage $HWND_INSTDIR ${BM_SETCHECK} 1 0

-  ${Else}

-    SendMessage $HWND_APPDATA ${BM_SETCHECK} 1 0

-  ${EndIf}

-  

-  nsDialogs::Show

-  

-FunctionEnd

-

-Function DataLocationOnLeave

-  ${NSD_GetState} $HWND_APPDATA $R0

-  ${If} $R0 == "1"

-    SetShellVarContext current

-    StrCpy $BLENDERHOME "$APPDATA\Blender Foundation\Blender"

-    SetShellVarContext all

-  ${Else}

-    ${NSD_GetState} $HWND_INSTDIR $R0

-    ${If} $R0 == "1"

-      StrCpy $BLENDERHOME $INSTDIR

-    ${Else}

-      ${NSD_GetState} $HWND_HOMEDIR $R0

-      ${If} $R0 == "1"

-        ReadEnvStr $BLENDERHOME "HOME"

-      ${EndIf}

-    ${EndIf}

-  ${EndIf}

-FunctionEnd

-

-Section "Blender [VERSION] (required)" InstallFiles

-  SectionIn RO

-

-  ; Set output path to the installation directory.

-  SetOutPath $INSTDIR

-  ; The contents of Blender installation root dir

-  [ROOTDIRCONTS]

-  

-  ; All datafiles (python, scripts, config)

-  [DODATAFILES]

-  

-  SetOutPath $INSTDIR

-  ${If} ${RunningX64}

-    SetRegView 64

-  ${EndIf}

-  ; Write the installation path into the registry

-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "Install_Dir" "$INSTDIR"

-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"

-  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ShortVersion" "[SHORTVERSION]"

-  ; Write the uninstall keys for Windows

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender"

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "Publisher" "Blender Foundation"

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "URLInfoAbout" "http://www.blender.org/"

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayVersion" "[VERSION]"

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayIcon" "$INSTDIR\blender.exe"

-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'

-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoModify" 1

-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoRepair " 1

-  WriteUninstaller "uninstall.exe"

-

-SectionEnd

-

-Section "Add Start Menu Shortcuts" StartMenu

-  SetShellVarContext all

-  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"

-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0

-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Blender.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0

-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\readme.html" "" "" 0

-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0

-  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0

-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons

-SectionEnd

-

-Section "Add Desktop Shortcut" DesktopShortcut

-  CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0

-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons

-SectionEnd

-

-Section "Open .blend files with Blender" BlendRegister

-  ExecWait '"$INSTDIR\blender.exe" -r'

-SectionEnd

-

-UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."

-

-Section "Uninstall"

-  ; Remove registry keys

-  ${If} ${RunningX64}

-    SetRegView 64

-  ${EndIf}

-  

-  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"

-  ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"

-  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Blender"

-  DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"

-  DeleteRegKey HKCR ".blend"

-  DeleteRegKey HKCR "blendfile"

-  DeleteRegKey HKCR "CLSID\{D45F043D-F17F-4e8a-8435-70971D9FA46D}"

-  SetShellVarContext all

- 

-  ; Remove files

-  [DELROOTDIRCONTS]

-

-  Delete "$INSTDIR\uninstall.exe"

-

-  MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove

-  RMDir /r "$BLENDERHOME\$SHORTVERSION\scripts"

-NextNoScriptRemove:

-  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\config? NOTE: This includes your startup.blend, bookmarks and any other file and directory you may have created in that directory" IDNO NextNoConfigRemove

-  RMDir /r "$BLENDERHOME\$SHORTVERSION\config"

-NextNoConfigRemove:

-  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove

-  RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"

-NextNoPluginRemove:

-  ; Try to remove dirs, but leave them if they contain anything

-  RMDir "$BLENDERHOME\$SHORTVERSION\plugins"

-  RMDir "$BLENDERHOME\$SHORTVERSION\config"

-  RMDir "$BLENDERHOME\$SHORTVERSION\scripts"

-  RMDir "$BLENDERHOME\$SHORTVERSION"

-  RMDir "$BLENDERHOME"

-  ; Remove shortcuts

-  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"

-  Delete "$DESKTOP\Blender.lnk"

-  ; Remove all link related directories and files

-  RMDir /r "$SMPROGRAMS\Blender Foundation"

-  ; Clear out installation dir

-  RMDir /r "$INSTDIR"

-  

-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; Refresh icons

-SectionEnd

-

-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

-  !insertmacro MUI_DESCRIPTION_TEXT ${InstallFiles} $(DESC_InstallFiles)

-  !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} $(DESC_StartMenu)

-  !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} $(DESC_DesktopShortcut)

-  !insertmacro MUI_DESCRIPTION_TEXT ${BlendRegister} $(DESC_BlendRegister)

-!insertmacro MUI_FUNCTION_DESCRIPTION_END

-

+;
+; $Id$
+;
+; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
+;
+
+SetCompressor /SOLID lzma
+
+Name "Blender [VERSION]" 
+
+RequestExecutionLevel admin
+
+!include "MUI.nsh"
+!include "WinVer.nsh"
+!include "FileFunc.nsh"
+!include "WordFunc.nsh"
+!include "nsDialogs.nsh"
+!include "x64.nsh"
+
+!define MUI_ABORTWARNING
+
+!define MUI_WELCOMEPAGE_TEXT  "This wizard will guide you through the installation of Blender. It is recommended that you close all other applications before starting Setup."
+!define MUI_WELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP  "[RELDIR]\00.header.bmp"
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_FINISHPAGE_RUN "$INSTDIR\blender.exe"
+!define MUI_CHECKBITMAP "[RELDIR]\00.checked.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "[RELDIR]\01.installer.bmp"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "[DISTDIR]\Copyright.txt"
+!insertmacro MUI_PAGE_COMPONENTS
+    
+!insertmacro MUI_PAGE_DIRECTORY
+Page custom DataLocation DataLocationOnLeave
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+  
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro Locate
+!insertmacro VersionCompare
+
+
+Icon "[RELDIR]\00.installer.ico"
+UninstallIcon "[RELDIR]\00.installer.ico"
+
+;--------------------------------
+;Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+    
+;--------------------------------
+;Language Strings
+
+  ;Description
+  LangString DESC_InstallFiles ${LANG_ENGLISH} "Copy all required files to the application folder."
+  LangString DESC_StartMenu ${LANG_ENGLISH} "Add shortcut items to the Start Menu. (Recommended)"
+  LangString DESC_DesktopShortcut ${LANG_ENGLISH} "Add a shortcut to Blender on your desktop."
+  LangString DESC_BlendRegister ${LANG_ENGLISH} "Blender can register itself with .blend files to allow double-clicking from Windows Explorer, etc."
+  LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Specify User Data Location"
+;--------------------------------
+;Data
+
+Caption "Blender [VERSION] Installer"
+OutFile "[DISTDIR]\..\blender-[VERSION]-windows[BITNESS].exe"
+InstallDir $INSTDIR ; $INSTDIR is set inside .onInit
+BrandingText "Blender Foundation | http://www.blender.org"
+ComponentText "This will install Blender [VERSION] on your computer."
+
+DirText "Use the field below to specify the folder where you want Blender to be copied to. To specify a different folder, type a new name or use the Browse button to select an existing folder."
+
+SilentUnInstall normal
+
+Var BLENDERHOME
+Var SHORTVERSION ; This is blender_version_decimal() from path_util.c
+
+; Custom controls
+Var HWND
+
+Var HWND_APPDATA
+Var HWND_INSTDIR
+Var HWND_HOMEDIR
+
+Function .onInit
+  ClearErrors
+  StrCpy $SHORTVERSION "[SHORTVERSION]"
+
+  ${If} ${RunningX64}
+    ${If} "[BITNESS]" == "32"
+    ${OrIf} "[BITNESS]" == "-mingw"
+      StrCpy $INSTDIR "$PROGRAMFILES32\Blender Foundation\Blender" ; Can't use InstallDir inside Section
+    ${ElseIf} "[BITNESS]" == "64"
+      StrCpy $INSTDIR "$PROGRAMFILES64\Blender Foundation\Blender"
+    ${EndIf}
+  ${Else}
+    StrCpy $INSTDIR "$PROGRAMFILES\Blender Foundation\Blender"
+  ${EndIf}
+FunctionEnd
+
+Function un.onInit
+FunctionEnd
+
+Function DataLocation
+  nsDialogs::Create /NOUNLOAD 1018
+  Pop $HWND
+  
+  ${If} $HWND == error
+    Abort
+  ${EndIf}
+  
+  ${NSD_CreateLabel} 0 0 100% 24u "Please specify where you wish to install Blender's user data files. Be aware that if you choose to use your Application Data directory, your preferences and scripts will only be accessible by the current user account."
+  ${NSD_CreateRadioButton} 0 50 100% 12u "Use Application Data directory (recommended)"
+  Pop $HWND_APPDATA
+  ${NSD_CreateRadioButton} 0 80 100% 12u "Use installation directory"
+  Pop $HWND_INSTDIR
+  ${NSD_CreateRadioButton} 0 110 100% 12u "I have defined a %HOME% variable, please install files there"
+  Pop $HWND_HOMEDIR
+  
+  ${If} ${AtMostWinME}
+    GetDlgItem $0 $HWND $HWND_APPDATA
+    EnableWindow $0 0
+    SendMessage $HWND_INSTDIR ${BM_SETCHECK} 1 0
+  ${Else}
+    SendMessage $HWND_APPDATA ${BM_SETCHECK} 1 0
+  ${EndIf}
+  
+  nsDialogs::Show
+  
+FunctionEnd
+
+Function DataLocationOnLeave
+  ${NSD_GetState} $HWND_APPDATA $R0
+  ${If} $R0 == "1"
+    SetShellVarContext current
+    StrCpy $BLENDERHOME "$APPDATA\Blender Foundation\Blender"
+    SetShellVarContext all
+  ${Else}
+    ${NSD_GetState} $HWND_INSTDIR $R0
+    ${If} $R0 == "1"
+      StrCpy $BLENDERHOME $INSTDIR
+    ${Else}
+      ${NSD_GetState} $HWND_HOMEDIR $R0
+      ${If} $R0 == "1"
+        ReadEnvStr $BLENDERHOME "HOME"
+      ${EndIf}
+    ${EndIf}
+  ${EndIf}
+FunctionEnd
+
+Section "Blender [VERSION] (required)" InstallFiles
+  SectionIn RO
+
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  ; The contents of Blender installation root dir
+  [ROOTDIRCONTS]
+  
+  ; All datafiles (python, scripts, config)
+  [DODATAFILES]
+  
+  SetOutPath $INSTDIR
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
+  ; Write the installation path into the registry
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"
+  WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ShortVersion" "[SHORTVERSION]"
+  ; Write the uninstall keys for Windows
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "Publisher" "Blender Foundation"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "URLInfoAbout" "http://www.blender.org/"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayVersion" "[VERSION]"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayIcon" "$INSTDIR\blender.exe"
+  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "NoRepair " 1
+  WriteUninstaller "uninstall.exe"
+
+SectionEnd
+
+Section "Add Start Menu Shortcuts" StartMenu
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\Blender Foundation\Blender\"
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Blender.lnk" "$INSTDIR\Blender.exe" "" "$INSTDIR\blender.exe" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Readme.lnk" "$INSTDIR\readme.html" "" "" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\Copyright.lnk" "$INSTDIR\Copyright.txt" "" "$INSTDIR\copyright.txt" 0
+  CreateShortCut "$SMPROGRAMS\Blender Foundation\Blender\GPL-license.lnk" "$INSTDIR\GPL-license.txt" "" "$INSTDIR\GPL-license.txt" 0
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons
+SectionEnd
+
+Section "Add Desktop Shortcut" DesktopShortcut
+  CreateShortCut "$DESKTOP\Blender.lnk" "$INSTDIR\blender.exe" "" "$INSTDIR\blender.exe" 0
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; refresh icons
+SectionEnd
+
+Section "Open .blend files with Blender" BlendRegister
+  ExecWait '"$INSTDIR\blender.exe" -r'
+SectionEnd
+
+UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue."
+
+Section "Uninstall"
+  ; Remove registry keys
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
+  
+  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"
+  ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"
+  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
+  DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"
+  DeleteRegKey HKCR ".blend"
+  DeleteRegKey HKCR "blendfile"
+  DeleteRegKey HKCR "CLSID\{D45F043D-F17F-4e8a-8435-70971D9FA46D}"
+  SetShellVarContext all
+ 
+  ; Remove files
+  [DELROOTDIRCONTS]
+
+  Delete "$INSTDIR\uninstall.exe"
+
+  MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\scripts"
+NextNoScriptRemove:
+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\config? NOTE: This includes your startup.blend, bookmarks and any other file and directory you may have created in that directory" IDNO NextNoConfigRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\config"
+NextNoConfigRemove:
+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove
+  RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"
+NextNoPluginRemove:
+  ; Try to remove dirs, but leave them if they contain anything
+  RMDir "$BLENDERHOME\$SHORTVERSION\plugins"
+  RMDir "$BLENDERHOME\$SHORTVERSION\config"
+  RMDir "$BLENDERHOME\$SHORTVERSION\scripts"
+  RMDir "$BLENDERHOME\$SHORTVERSION"
+  RMDir "$BLENDERHOME"
+  ; Remove shortcuts
+  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"
+  Delete "$DESKTOP\Blender.lnk"
+  ; Remove all link related directories and files
+  RMDir /r "$SMPROGRAMS\Blender Foundation"
+  ; Clear out installation dir
+  RMDir /r "$INSTDIR"
+  
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' ; Refresh icons
+SectionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${InstallFiles} $(DESC_InstallFiles)
+  !insertmacro MUI_DESCRIPTION_TEXT ${StartMenu} $(DESC_StartMenu)
+  !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortcut} $(DESC_DesktopShortcut)
+  !insertmacro MUI_DESCRIPTION_TEXT ${BlendRegister} $(DESC_BlendRegister)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
diff --git a/source/darwin/blender.app/Contents/Info.plist b/source/darwin/blender.app/Contents/Info.plist
index 2f5d235a619..23941d91075 100644
--- a/source/darwin/blender.app/Contents/Info.plist
+++ b/source/darwin/blender.app/Contents/Info.plist
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">

-<plist version="0.9">

-<dict>

-	<key>CFBundleInfoDictionaryVersion</key>

-	<string>6.0</string>

-

-	<key>CFBundleExecutable</key>

-	<string>blender</string>

-

-	<key>CFBundlePackageType</key>

-	<string>APPL</string>

-	<key>CFBundleSignature</key>

-	<string>????</string>

-

-	<key>CFBundleIconFile</key>

-	<string>blender icon.icns</string>

-

-	<key>CFBundleName</key>

-	<string>Blender</string>

-	<key>CFBundleIdentifier</key>

-	<string>org.blenderfoundation.blender</string>

-

-	<key>CFBundleVersion</key>

-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

-	<key>CFBundleShortVersionString</key>

-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>

-	<key>CFBundleGetInfoString</key>

-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

-

-	<key>CFBundleDocumentTypes</key>

-	<array>

-		<dict>

-			<key>CFBundleTypeIconFile</key>

-			<string>blender file icon.icns</string>

-			<key>CFBundleTypeName</key>

-			<string>Blender File</string>

-			<key>CFBundleTypeOSTypes</key>

-			<array>

-				<string>BLND</string>

-			</array>

-			<key>CFBundleTypeExtensions</key>

-			<array>

-				<string>blend</string>

-			</array>

-			<key>CFBundleTypeRole</key>

-			<string>Editor</string>

-			<key>LSIsAppleDefaultForType</key>

-			<true/>	

-		</dict>

-	</array>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleExecutable</key>
+	<string>blender</string>
+
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+
+	<key>CFBundleIconFile</key>
+	<string>blender icon.icns</string>
+
+	<key>CFBundleName</key>
+	<string>Blender</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.blenderfoundation.blender</string>
+
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFile</key>
+			<string>blender file icon.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Blender File</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>BLND</string>
+			</array>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>blend</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSIsAppleDefaultForType</key>
+			<true/>	
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/source/darwin/blenderplayer.app/Contents/Info.plist b/source/darwin/blenderplayer.app/Contents/Info.plist
index f99338d6c47..54364d18866 100644
--- a/source/darwin/blenderplayer.app/Contents/Info.plist
+++ b/source/darwin/blenderplayer.app/Contents/Info.plist
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">

-<plist version="0.9">

-<dict>

-	<key>CFBundleInfoDictionaryVersion</key>

-	<string>6.0</string>

-

-	<key>CFBundleExecutable</key>

-	<string>blenderplayer</string>

-

-	<key>CFBundlePackageType</key>

-	<string>APPL</string>

-	<key>CFBundleSignature</key>

-	<string>????</string>

-

-	<key>CFBundleIconFile</key>

-	<string>blender player icon.icns</string>

-

-	<key>CFBundleName</key>

-	<string>BlenderPlayer</string>

-	<key>CFBundleIdentifier</key>

-	<string>org.blenderfoundation.blenderplayer</string>

-

-	<key>CFBundleVersion</key>

-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

-	<key>CFBundleShortVersionString</key>

-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>

-	<key>CFBundleGetInfoString</key>

-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

-

-	<key>CFBundleDocumentTypes</key>

-	<array>

-		<dict>

-			<key>CFBundleTypeIconFile</key>

-			<string>blender file icon.icns</string>

-			<key>CFBundleTypeName</key>

-			<string>Blender File</string>

-			<key>CFBundleTypeOSTypes</key>

-			<array>

-				<string>BLND</string>

-			</array>

-			<key>CFBundleTypeExtensions</key>

-			<array>

-				<string>blend</string>

-			</array>

-			<key>CFBundleTypeRole</key>

-			<string>Viewer</string>

-			<key>LSIsAppleDefaultForType</key>

-			<false/>

-		</dict>

-	</array>

-</dict>

-</plist>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleExecutable</key>
+	<string>blenderplayer</string>
+
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+
+	<key>CFBundleIconFile</key>
+	<string>blender player icon.icns</string>
+
+	<key>CFBundleName</key>
+	<string>BlenderPlayer</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.blenderfoundation.blenderplayer</string>
+
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFile</key>
+			<string>blender file icon.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Blender File</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>BLND</string>
+			</array>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>blend</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSIsAppleDefaultForType</key>
+			<false/>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/source/icons/blender.exe.manifest b/source/icons/blender.exe.manifest
index bc13bf4c586..a43d11b21a0 100644
--- a/source/icons/blender.exe.manifest
+++ b/source/icons/blender.exe.manifest
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

-    <security>

-      <requestedPrivileges>

-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>

-      </requestedPrivileges>

-    </security>

-  </trustInfo>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>