Removed AntTweakBar external dependancy.

SteerSuite · Apr 1, 2015 · 6a77974 · 6a77974
1 parent bd4a232
commit 6a77974
Show file tree

Hide file tree

Showing 141 changed files with 158 additions and 75,558 deletions.
diff --git a/.cproject b/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1030556248">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1030556248" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1030556248" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1030556248." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1909392740" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1126188141" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+							<builder buildPath="${workspace_loc:/SteerSuite_Release}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.807421498" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.85933468" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1944334998" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1274268778" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1666102180" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1588066744" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.817362842" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1764687365" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.debug.option.debugging.level.1129153151" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.612171906" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.589877919" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1174633704" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.219479659" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1752190864" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.233562392" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.978555687">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.978555687" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.978555687" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.978555687." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.32507613" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1808116760" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+							<builder buildPath="${workspace_loc:/SteerSuite_Release}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.887211668" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.883788781" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.726570511" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.2010187662" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1247777276" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.693084246" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1602301793" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.582016346" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.release.option.debugging.level.1412813627" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1612164731" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.2048706362" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.578585197" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.994636799" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.2089345736" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.331528208" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="SteerSuite_Release.cdt.managedbuild.target.gnu.exe.14561264" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1030556248;cdt.managedbuild.config.gnu.exe.debug.1030556248.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.817362842;cdt.managedbuild.tool.gnu.c.compiler.input.612171906">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1030556248;cdt.managedbuild.config.gnu.exe.debug.1030556248.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1944334998;cdt.managedbuild.tool.gnu.cpp.compiler.input.1588066744">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.978555687;cdt.managedbuild.config.gnu.exe.release.978555687.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.726570511;cdt.managedbuild.tool.gnu.cpp.compiler.input.693084246">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.978555687;cdt.managedbuild.config.gnu.exe.release.978555687.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1602301793;cdt.managedbuild.tool.gnu.c.compiler.input.1612164731">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/.project b/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SteerSuite_Release</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/build/build.sh b/build/build.sh
@@ -141,7 +141,7 @@ GLFW_LINK=""
 QT_LINK=""
 QT_INCLUDES=""
 
-ANT_TWEAK_LINK="-L../../external/AntTweakBar/lib -lAntTweakBar"
+# ANT_TWEAK_LINK="-L../../external/AntTweakBar/lib -lAntTweakBar"
 
 
 if [ "$ENABLE_GLFW_GUI" == "true" -o "$ENABLE_QT_GUI" == "true" ]; then
@@ -201,7 +201,7 @@ if [ "$BUILD_PLATFORM" == "osx" ]; then
     BUILD_SCRIPT_DEFINES="-D_OSX $GUI_DEFINES"
     STEERLIB_LFLAGS="$BASIC_LFLAGS $OSX_DYLIB_LFLAGS $OPENGL_LINK -lpthread -ldl $UTIL_LINK"
     STEERBENCH_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $STEERLIB_LINK $UTIL_LINK"
-    STEERSIM_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $OPENGL_LINK $QT_LINK $UTIL_LINK $STEERLIB_LINK $GLFW_LINK $ANT_TWEAK_LINK $PPR_LINK $ORCA_LINK $FOOTSTEP_LINK $CC_LINK "
+    STEERSIM_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $OPENGL_LINK $QT_LINK $UTIL_LINK $STEERLIB_LINK $GLFW_LINK $PPR_LINK $ORCA_LINK $FOOTSTEP_LINK $CC_LINK "
     STEERTOOL_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $STEERLIB_LINK $UTIL_LINK"
     SIMPLEAI_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $OSX_DYLIB_LFLAGS $STEERLIB_LINK $UTIL_LINK"
 
@@ -218,7 +218,7 @@ elif [ "$BUILD_PLATFORM" == "linux" ]; then
 
     echo "Building SteerSuite for Linux"
     RPATH_LFLAGS="-Wl,-rpath,$LIB_DIR" # -L$MODULES_DIR"
-	ANT_TWEAK_LINK="$ANT_TWEAK_LINK -lX11 -lXxf86vm -lXext"
+	# ANT_TWEAK_LINK="$ANT_TWEAK_LINK -lX11 -lXxf86vm -lXext"
 	BASIC_CFLAGS="$BASIC_CFLAGS -ggdb -g"
 	BASIC_LFLAGS="$BASIC_LFLAGS -ggdb -g"
 
@@ -239,7 +239,7 @@ elif [ "$BUILD_PLATFORM" == "linux" ]; then
 
     STEERLIB_INCLUDES="$BASIC_INCLUDES $UTIL_INCLUDE"
     STEERBENCH_INCLUDES="$BASIC_INCLUDES $STEERLIB_INCLUDE $UTIL_INCLUDE"
-    STEERSIM_INCLUDES="$BASIC_INCLUDES $STEERLIB_INCLUDE $QT_INCLUDES $ANT_TWEAK_LINK $UTIL_INCLUDE $PPR_INCLUDE $ORCA_INCLUDE $CC_INCLUDE"
+    STEERSIM_INCLUDES="$BASIC_INCLUDES $STEERLIB_INCLUDE $QT_INCLUDES $UTIL_INCLUDE $PPR_INCLUDE $ORCA_INCLUDE $CC_INCLUDE"
     STEERTOOL_INCLUDES="$BASIC_INCLUDES $STEERLIB_INCLUDE $UTIL_INCLUDE"
     SIMPLEAI_INCLUDES="$BASIC_INCLUDES $STEERLIB_INCLUDE $UTIL_INCLUDE"
 
@@ -255,7 +255,7 @@ elif [ "$BUILD_PLATFORM" == "linux" ]; then
     BUILD_SCRIPT_DEFINES="-D_LINUX $GUI_DEFINES"
     STEERLIB_LFLAGS="$BASIC_LFLAGS $OPENGL_LINK -lpthread -ldl $UTIL_LINK"
     STEERBENCH_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $STEERLIB_LINK $UTIL_LINK"
-    STEERSIM_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $UTIL_LINK $GLFW_LINK $OPENGL_LINK $QT_LINK $STEERLIB_LINK $ANT_TWEAK_LINK $PPR_LINK $ORCA_LINK $CC_LINK "
+    STEERSIM_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $UTIL_LINK $GLFW_LINK $OPENGL_LINK $QT_LINK $STEERLIB_LINK $PPR_LINK $ORCA_LINK $CC_LINK "
     STEERTOOL_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $STEERLIB_LINK $UTIL_LINK"
     SIMPLEAI_LFLAGS="$BASIC_LFLAGS $RPATH_LFLAGS $UTIL_LINK"
 
@@ -410,21 +410,6 @@ if [[ "$ENABLE_GLFW_GUI" == "true" && $BUILD_MODULE == "all" || "$ENABLE_GLFW_GU
     popd > /dev/null
 fi
 
-if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "anttweakbar" ]]; then
-    echo "==================================="
-    echo "Building AntTweakBar (external dependency)"
-    echo "==================================="
-    pushd ../external/AntTweakBar/src > /dev/null
-    if [ "$BUILD_PLATFORM" == "osx" ]; then
-        $MAKE -f MakeFile.osx
-	AntTweak_BUILD_RETURN_CODE=$?
-    else
-        $MAKE
-	AntTweak_BUILD_RETURN_CODE=$?
-    fi
-    popd > /dev/null
-fi
-
 
 if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "util" ]]; then
 	echo "==================================="
@@ -550,18 +535,6 @@ if [ "$ENABLE_GLFW_GUI" == "true" ]; then
     fi
 fi
 
-if [ $AntTweak_BUILD_RETURN_CODE == 0 ]; then
-	if [ "$BUILD_PLATFORM" == "osx" ]; then
-		echo "copying libAntTweakBar.dylib to $LIB_DIR"
-		cp ../external/AntTweakBar/lib/libAntTweakBar.dylib $LIB_DIR
-		AntTweak_INSTALL_RETURN_CODE=$?
-	else
-		echo "copying libAntTweakBar.so to $LIB_DIR"
-		cp ../external/AntTweakBar/lib/libAntTweakBar.so $LIB_DIR
-		AntTweak_INSTALL_RETURN_CODE=$?
-	fi
-fi
-
 if [ $STEERLIB_BUILD_RETURN_CODE == 0 ]; then
     echo "copying libsteer.so to $LIB_DIR"
     cp ../steerlib/build/libsteer.so $LIB_DIR
@@ -632,16 +605,6 @@ if [ "$ENABLE_GLFW_GUI" == "true" ]; then
 fi
 
 
-if [ $AntTweak_BUILD_RETURN_CODE != 0 ]; then
-    echo "* AntTweakBar did not build properly."
-else
-    if [ $AntTweak_INSTALL_RETURN_CODE != 0 ]; then
-	echo "* AntTweakBar built successfully, but could not be installed to $LIB_DIR."
-    else
-	echo "  AntTweakBar built and installed successfully."
-    fi
-fi
-
 if [ $STEERLIB_BUILD_RETURN_CODE != 0 ]; then
     echo "* SteerLib did not build properly."
 else

diff --git a/build/clean.sh b/build/clean.sh
@@ -99,34 +99,36 @@ fi
 echo "Cleaning lib/"
 if [ -d lib/ ]; then
 
-	 	if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "steertool" ]]; then
+	if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "steertool" ]]; then
     	rm -f lib/libsteer.so
     fi
-	 	if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "util" ]]; then
+
+	if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "util" ]]; then
     	rm -f lib/libutil.so
     fi
+
     if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "steersim" ]]; then
     	rm -f lib/libsteersim.so
     fi
+
     if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "glfw" ]]; then
     	rm -f lib/libglfw.so
     	rm -f lib/libglfw.dylib
-    fi
-		if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "anttweakbar" ]]; then
-    	rm -f lib/libAntTweakBar.so
-    	rm -f lib/libAntTweakBar.dylib
-    fi
+	fi
+
     if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "pprAI" ]]; then
     	rm -f lib/libpprAI.so
     	rm -f lib/pprAI.o
     fi
+
     if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "rvo2dAI" ]]; then
     	rm -f lib/librvo2dAI.so
     	rm -f lib/rvo2dAI.o
     fi
+
     if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "sfAI" ]]; then
     	rm -f lib/libsfAI.so
-			rm -f lib/sfAI.o
+		rm -f lib/sfAI.o
     fi
     rmdir lib/
 fi
@@ -152,15 +154,6 @@ if [ -d modules/ ]; then
     rmdir modules/
 fi
 
-if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "anttweakbar" ]]; then
-	echo "Cleaning AntTweakBar"
-	pushd ../external/AntTweakBar/src > /dev/null
-   $MAKE -f MakeFile.osx clean
-   $MAKE clean
-	popd > /dev/null
-fi
-
-
 if [[ $BUILD_MODULE == "all" || $BUILD_MODULE == "glfw" ]]; then
 	echo "Cleaning GLFW"
 	pushd ../external/glfw > /dev/null

diff --git a/build/win32/steersuite.sln b/build/win32/steersuite.sln
@@ -43,8 +43,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rvo2dAI", "..\..\rvo2AI\bui
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\..\util\build\win32\util.vcxproj", "{48C8DD57-0195-44A5-AB09-C2756165768A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntTweakBar", "..\..\external\AntTweakBar\src\AntTweakBar.vcxproj", "{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfAI", "..\..\socialForcesAI\build\win32\sfAI.vcxproj", "{F9169E40-B72E-4A09-B85C-9EE1389225E5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4559341E-D53D-45E5-A67C-43D7C5956636} = {4559341E-D53D-45E5-A67C-43D7C5956636}