diff --git a/windows/netgen.vcxproj b/windows/netgen.vcxproj
index 9653357c..3f397041 100644
--- a/windows/netgen.vcxproj
+++ b/windows/netgen.vcxproj
@@ -42,35 +42,35 @@
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
Application
- v110
+ CTP_Nov2013
@@ -175,6 +175,8 @@
Level3
EditAndContinue
+ true
+ 4250
false
@@ -216,6 +218,8 @@
Level3
ProgramDatabase
+ true
+ 4250
false
@@ -248,7 +252,7 @@
true
Speed
true
- $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include
+ $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include
WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -257,15 +261,16 @@
Level2
ProgramDatabase
4250
+ true
false
- pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;zdll.lib;Togl17.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)
+ pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;zdll.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)
NotSet
- $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;%(AdditionalLibraryDirectories)
true
false
Console
@@ -275,6 +280,7 @@
$(OutDir)nginterface.lib
MachineX86
true
+ false
Running POSTBUILD Script....
@@ -294,29 +300,30 @@
true
Speed
true
- $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include
+ $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(SolutionDir)..\..\ext_libs\zlib\include
WIN32;NDEBUG;_CONSOLE;MSVC_EXPRESS;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreadedDLL
- StreamingSIMDExtensions
+ StreamingSIMDExtensions2
Level2
ProgramDatabase
4250
+ true
false
- pthreadVC2.lib;zlib1.lib;tcl85.lib;tk85.lib;Togl17.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)
+ pthreadVC2.lib;zlib1.lib;tcl85.lib;tk85.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)
NotSet
$(OutDir)$(ProjectName).exe
- $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;%(AdditionalLibraryDirectories)
true
false
Console
- true
+ false
true
UseLinkTimeCodeGeneration
$(OutDir)nginterface.lib
@@ -338,7 +345,7 @@
true
Speed
true
- $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthread-w32\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories)
+ $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories)
WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -346,15 +353,17 @@
Level2
ProgramDatabase
+ true
+ 4250
false
- pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;Togl17.lib;glu32.lib;opengl32.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
+ pthreadVC2.lib;tcl85.lib;tk85.lib;tix84.lib;zdll.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
NotSet
- $(SolutionDir)..\..\ext_libs\tcl\lib;$(SolutionDir)..\..\ext_libs\pthread-w32\lib;$(CASROOT)\win32\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)..\..\ext_libs\tcl\lib\x86;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\win32;$(CASROOT)\win32\vc8\lib;%(AdditionalLibraryDirectories)
true
false
Console
@@ -364,6 +373,7 @@
$(OutDir)nginterface.lib
MachineX86
true
+ false
Running POSTBUILD Script....
@@ -383,7 +393,7 @@
true
Speed
true
- $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl-64\include;$(SolutionDir)..\..\ext_libs\pthread-w64\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories)
+ $(SolutionDir)..;$(SolutionDir)..\ng;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\libsrc\interface;$(SolutionDir)..\..\ext_libs\tcl\include;$(SolutionDir)..\..\ext_libs\pthreads-win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\..\ext_libs\FFMPEG\include;$(CASROOT)\inc;%(AdditionalIncludeDirectories)
WIN32;WNT;NDEBUG;_CONSOLE;MSVC_EXPRESS;_OCC64;Standard_EXPORT=;OCCGEOMETRY;OPENGL;_WIN32_WINNT=0x0502;NGINTERFACE_EXPORTS;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -391,15 +401,17 @@
Level2
ProgramDatabase
+ true
+ 4250
false
- pthreadVC2_64.lib;tcl85.lib;tk85.lib;tix84.lib;Togl17.lib;glu32.lib;opengl32.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
+ pthreadVC2.lib;tcl85.lib;tk85.lib;zlib1.lib;tix84.lib;Togl17.lib;glu32.lib;opengl32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
NotSet
- $(SolutionDir)..\..\ext_libs\tcl-64\lib;$(SolutionDir)..\..\ext_libs\pthread-w64\lib;$(CASROOT)\win64\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)..\..\ext_libs\tcl\lib\x64;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\FFMPEG\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\lib;$(CASROOT)\win64\vc9\lib;%(AdditionalLibraryDirectories)
true
false
Console
@@ -409,6 +421,7 @@
$(OutDir)nginterface.lib
MachineX64
true
+ false
Running POSTBUILD Script....
@@ -431,6 +444,8 @@
Level3
EditAndContinue
+ true
+ 4250
false
@@ -472,6 +487,8 @@
Level3
ProgramDatabase
+ true
+ 4250
false
@@ -649,6 +666,7 @@
+
@@ -676,6 +694,7 @@
+
diff --git a/windows/nglib.vcxproj b/windows/nglib.vcxproj
index 051659fb..a0a66943 100644
--- a/windows/nglib.vcxproj
+++ b/windows/nglib.vcxproj
@@ -34,7 +34,7 @@
DynamicLibrary
- v110
+ v120_CTP_Nov2012
Unicode
true
@@ -46,12 +46,12 @@
DynamicLibrary
- v110
+ v120_CTP_Nov2012
Unicode
DynamicLibrary
- v110
+ v120_CTP_Nov2012
Unicode
true
@@ -63,7 +63,7 @@
DynamicLibrary
- v110
+ v120_CTP_Nov2012
Unicode
@@ -135,6 +135,7 @@
Level3
EditAndContinue
+ true
pthreadVC2.lib;%(AdditionalDependencies)
@@ -171,6 +172,7 @@
Level3
ProgramDatabase
+ true
pthreadVC2_64.lib;%(AdditionalDependencies)
@@ -211,6 +213,7 @@
Level2
ProgramDatabase
4250
+ true
pthreadVC2.lib;zdll.lib;%(AdditionalDependencies)
@@ -251,6 +254,7 @@
Level2
ProgramDatabase
4250
+ true
pthreadVC2.lib;zlib1.lib;%(AdditionalDependencies)
@@ -277,7 +281,7 @@
AnySuitable
true
Speed
- $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthread-w32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories)
+ $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\..\ext_libs\zlib\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories)
WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)
MultiThreadedDLL
true
@@ -288,10 +292,12 @@
$(IntDir)
Level2
ProgramDatabase
+ true
+ 4250
- pthreadVC2.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
- $(CASROOT)\win32\lib;$(SolutionDir)..\..\ext_libs\pthread-w32\lib;%(AdditionalLibraryDirectories)
+ pthreadVC2.lib;zdll.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKDCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
+ $(CASROOT)\win32\vc8\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x86;$(SolutionDir)..\..\ext_libs\zlib\x86\lib;%(AdditionalLibraryDirectories)
$(OutDir)$(TargetFileName).intermediate.manifest
@@ -316,7 +322,7 @@
AnySuitable
true
Speed
- $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthread-w64\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;%(AdditionalIncludeDirectories)
+ $(CASROOT)\inc;$(SolutionDir)..\..\ext_libs\pthreads-Win32\include;$(SolutionDir)..\libsrc\include;$(SolutionDir)..\nglib;$(SolutionDir)..\;$(SolutionDir)..\..\ext_libs\zlib\include;%(AdditionalIncludeDirectories)
WNT;WIN32;NDEBUG;_WINDOWS;_USRDLL;NGLIB_EXPORTS;MSVC_EXPRESS;Standard_EXPORT=;OCCGEOMETRY;_OCC64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)
MultiThreadedDLL
true
@@ -327,10 +333,12 @@
$(IntDir)
Level2
ProgramDatabase
+ true
+ 4250
- pthreadVC2_64.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
- $(CASROOT)\win64\lib;$(SolutionDir)..\..\ext_libs\pthread-w64\lib;%(AdditionalLibraryDirectories)
+ pthreadVC2.lib;zlib1.lib;TKernel.lib;TKGeomBase.lib;TKMath.lib;TKG2d.lib;TKG3d.lib;TKXSBase.lib;TKOffset.lib;TKFillet.lib;TKShHealing.lib;TKMesh.lib;TKMeshVS.lib;TKTopAlgo.lib;TKGeomAlgo.lib;TKBool.lib;TKPrim.lib;TKBO.lib;TKIGES.lib;TKBRep.lib;TKSTEPBase.lib;TKSTEP.lib;TKSTL.lib;TKSTEPAttr.lib;TKSTEP209.lib;TKXDESTEP.lib;TKXDEIGES.lib;TKXCAF.lib;TKLCAF.lib;%(AdditionalDependencies)
+ $(CASROOT)\win64\vc9\lib;$(SolutionDir)..\..\ext_libs\pthreads-Win32\lib\x64;$(SolutionDir)..\..\ext_libs\zlib\x64\\lib;%(AdditionalLibraryDirectories)
$(OutDir)$(TargetFileName).intermediate.manifest
MachineX64
diff --git a/windows/postBuild_netgen.bat b/windows/postBuild_netgen.bat
index d3059adc..452349a2 100644
--- a/windows/postBuild_netgen.bat
+++ b/windows/postBuild_netgen.bat
@@ -113,6 +113,16 @@ if /i "%BUILD_ARCH%" == "win32" (
REM if errorlevel 1 goto externalInstallFailed
)
+REM *** Finally copy the FFMPEG dlls to the bin folder ***
+if /i "%BUILD_ARCH%"=="x64" (
+ echo Copying FFMPEG dlls
+ C:\Windows\System32\xcopy "%PROJ_DIR%..\..\ext_libs\FFMPEG\dll\x64\*.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+)
+if /i "%BUILD_ARCH%"=="win32" (
+ echo Copying FFMPEG dlls
+ C:\Windows\System32\xcopy "%PROJ_DIR%..\..\ext_libs\FFMPEG\dll\Win32\*.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+)
+
echo Copying tutorials
xcopy "%PROJ_DIR%..\tutorials" "%INSTALL_FOLDER%\tutorials\" /i /d /y /e
diff --git a/windows/postBuild_nglib.bat b/windows/postBuild_nglib.bat
index 588be9af..ffb1690b 100644
--- a/windows/postBuild_nglib.bat
+++ b/windows/postBuild_nglib.bat
@@ -63,6 +63,19 @@ if /i "%BUILD_ARCH%" == "x64" (
xcopy "%PROJ_DIR%%PROJ_NAME%\%BUILD_ARCH%\%BUILD_TYPE%\%PROJ_NAME%.lib" "%INSTALL_FOLDER%\lib\" /i /d /y
if errorlevel 1 goto LibInstallFailed
)
+
+if /i "%BUILD_ARCH%" == "x64" (
+ xcopy "%PROJ_DIR%..\..\ext_libs\pthreads-Win32\dll\x64\pthreadVC2.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+ xcopy "%PROJ_DIR%..\..\ext_libs\zlib\x64\lib\zlib1.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+
+ if errorlevel 1 goto ExternalInstallFailed
+)
+if /i "%BUILD_ARCH%" == "win32" (
+ xcopy "%PROJ_DIR%..\..\ext_libs\pthreads-Win32\dll\x86\pthreadVC2.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+ xcopy "%PROJ_DIR%..\..\ext_libs\zlib\x86\lib\zlib1.dll" "%INSTALL_FOLDER%\bin" /i /d /y
+ if errorlevel 1 goto ExternalInstallFailed
+)
+
echo Installing %PROJ_NAME%.lib: Completed OK!!
REM *** Copy the include file nglib.h into the install folder ***
@@ -96,6 +109,9 @@ exit 1
:LibInstallFailed
echo POSTBUILD Script for %PROJ_NAME% FAILED..... Error copying %PROJ_NAME%.lib or %PROJ_NAME%.h into install folder!!!
exit 1
+:ExternalInstallFailed
+echo POSTBUILD Script for %PROJ_NAME% FAILED..... Error copying pthreadVC2.dll into install folder!!!
+exit 1
:BuildEventOK
echo POSTBUILD Script for %PROJ_NAME% completed OK.....!!