Update WOK compiler options defaults.
Update VS2008 project files generation.
Update Code::Blocks files geenration.
Correct codeblocks.sh for Linux compatibility
Update VS2010/VS2012 project files generation.
Update automake building procedure.
-- gcc tools should be available in PATH
-- C++ compiler
@set %CSF_CXX_COMPILER = "g++ ";
- @set %CSF_CXX_SysOptions = " -fPIC -DPIC -Wall";
+ @set %CSF_CXX_SysOptions = " -fPIC -DPIC -mmmx -msse -msse2 -mfpmath=sse -Wall";
@string %CSF_CXX_Options = " -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 " %CSF_PRODUCTS_DEFINES " ";
@set %CSF_CXX_ModeOpt = " -O3 -DNDEBUG -DNo_Exception ";
@set %CSF_CXX_ModeOptDeb = " -g -O0 -DDEB -D_DEBUG ";
-- C compiler
@set %CSF_C_COMPILER = "gcc ";
@string %CSF_C_INCLUDE += "";
- @set %CSF_C_SysOptions = " -fPIC -DPIC -Wall";
+ @set %CSF_C_SysOptions = " -fPIC -DPIC -mmmx -msse -msse2 -mfpmath=sse -Wall";
@set %CSF_C_Options = " -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions";
@set %CSF_C_ModeOpt = " -O3 -DNDEBUG -DNo_Exception ";
@set %CSF_C_ModeOptDeb = " -O0 -g -DDEB -D_DEBUG ";
@set %CSF_CXX_COMPILER = "g++ ";
- @set %CSF_CXX_SysOptions = " -fPIC -funsigned-char -Wall -fmessage-length=0";
+ @set %CSF_CXX_SysOptions = " -fPIC -funsigned-char -mmmx -msse -msse2 -mfpmath=sse -Wall -fmessage-length=0";
@string %CSF_CXX_Options = " -DOCC_CONVERT_SIGNALS " %CSF_PRODUCTS_DEFINES " ";
@if (%MACOSX_USE_GLX == "true") then
@string %CSF_CXX_Options += "-DMACOSX_USE_GLX ";
@set %CSF_C_COMPILER = "gcc ";
@string %CSF_C_INCLUDE += "";
- @set %CSF_C_SysOptions = " -fPIC -funsigned-char -Wall";
+ @set %CSF_C_SysOptions = " -fPIC -funsigned-char -mmmx -msse -msse2 -mfpmath=sse -Wall";
@set %CSF_C_Options = " -fexceptions";
@set %CSF_C_ModeOpt = " -O3 -DNDEBUG -DNo_Exception ";
@set %CSF_C_ModeOptDeb = " -gdwarf-2 -O0 -DDEB -D_DEBUG ";
-- Visual Studio compilers and tools should be set in PATH
@set %CSF_CXX_COMPILER = "cl.exe ";
- @set %CSF_CXX_SysOptions = " -nologo -W3 ";
+ @set %CSF_CXX_SysOptions = " -nologo -arch:SSE2 -W3 ";
@string %CSF_CXX_Options = " -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE " %CSF_PRODUCTS_DEFINES " ";
@set %CSF_CXX_ModeOpt = " -MD -EHa -O2 -Gy -DNDEBUG -DNo_Exception ";
@set %CSF_CXX_ModeOptDeb = " -MDd -EHa -Od -Gm -Zi -DDEB -D_DEBUG ";
-- C compiler
@set %CSF_C_COMPILER = "cl.exe ";
- @set %CSF_C_SysOptions = " -nologo -W3 ";
+ @set %CSF_C_SysOptions = " -nologo -arch:SSE2 -W3 ";
@string %CSF_C_Options = " -DWNT -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE " %CSF_PRODUCTS_DEFINES " ";
@set %CSF_C_ModeOpt = " -MD -EHa -O2 -Gy -DNDEBUG -DNo_Exception ";
@set %CSF_C_ModeOptDeb = " -MDd -EHa -Od -Gm -Zi -DDEB -D_DEBUG ";
puts $aFile "\t\t\t\t<Compiler>"
if { "$aWokStation" == "wnt" } {
puts $aFile "\t\t\t\t\t<Add option=\"-MD\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-arch:SSE2\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-EHsc\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-O2\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-W3\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-MP\" />"
} else {
puts $aFile "\t\t\t\t\t<Add option=\"-O2\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-mmmx\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-msse\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-msse2\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-mfpmath=sse\" />"
}
foreach aMacro $theDefines {
puts $aFile "\t\t\t\t\t<Add option=\"-D${aMacro}\" />"
puts $aFile "\t\t\t\t<Compiler>"
if { "$aWokStation" == "wnt" } {
puts $aFile "\t\t\t\t\t<Add option=\"-MDd\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-arch:SSE2\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-EHsc\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-Od\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-Zi\" />"
} else {
puts $aFile "\t\t\t\t\t<Add option=\"-O0\" />"
puts $aFile "\t\t\t\t\t<Add option=\"-g\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-mmmx\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-msse\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-msse2\" />"
+ puts $aFile "\t\t\t\t\t<Add option=\"-mfpmath=sse\" />"
}
foreach aMacro $theDefines {
puts $aFile "\t\t\t\t\t<Add option=\"-D${aMacro}\" />"
source ./env.sh "$TARGET" "$1"
-/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/mac/cbp/OCCT.workspace
+if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
+ /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+else
+ codeblocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+fi
CFLAGS="$CFLAGS -DCSFDB -DOCC_CONVERT_SIGNALS"
case $platform in
- Linux*) CXXFLAGS="$CXXFLAGS -DLIN -DLININTEL -D_GNU_SOURCE=1 -Wall"
- CFLAGS="$CFLAGS -DLIN -DLININTEL -fexceptions -Wall"
+ Linux*) CXXFLAGS="$CXXFLAGS -DLIN -DLININTEL -D_GNU_SOURCE=1 -mmmx -msse -msse2 -mfpmath=sse -Wall"
+ CFLAGS="$CFLAGS -DLIN -DLININTEL -fexceptions -mmmx -msse -msse2 -mfpmath=sse -Wall"
LDFLAGS="$LDFLAGS -lstdc++ -lrt";;
SunOS*) CXXFLAGS="$CXXFLAGS -Usun -DSOLARIS -instances=static"
CFLAGS="$CFLAGS -Usun -DSOLARIS -instances=static"
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\..\..\..\win32\vc9\obj\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__TKNAM__/"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="2"
PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
ObjectFile=".\..\..\..\win32\vc9\objd\__TKNAM__/"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\..\..\..\win64\vc9\obj\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__TKNAM__/"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="2"
PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"
ObjectFile=".\..\..\..\win64\vc9\objd\__TKNAM__/"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
EnableFunctionLevelLinking="true"
AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
ObjectFile=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="2"
AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
ObjectFile=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
EnableFunctionLevelLinking="true"
AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
ObjectFile=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="2"
AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
ObjectFile=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__XQTNAM__/"