diff --git a/cbp/LibTCC.cbp b/cbp/LibTCC.cbp
index af024a55..d4304700 100644
--- a/cbp/LibTCC.cbp
+++ b/cbp/LibTCC.cbp
@@ -80,9 +80,85 @@
 					<Add option="-m64" />
 				</Linker>
 			</Target>
+			<Target title="Linux32 Debug Static">
+				<Option output="../bin/linux32-d/tcc1" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="../obj/win32-d/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-m32" />
+					<Add option="-g" />
+					<Add option="-fPIC" />
+					<Add option="-DDEBUG" />
+					<Add option="-DTCC_TARGET_I386" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+				</Linker>
+			</Target>
+			<Target title="Linux32 Release Static">
+				<Option output="../bin/linux32/tcc1" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="../obj/win32/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-m32" />
+					<Add option="-fPIC" />
+					<Add option="-DNDEBUG" />
+					<Add option="-DTCC_TARGET_I386" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add option="-m32" />
+				</Linker>
+			</Target>
+			<Target title="Linux64 Debug Static">
+				<Option output="../bin/linux64-d/tcc1" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="../obj/win32-d/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-m64" />
+					<Add option="-g" />
+					<Add option="-fPIC" />
+					<Add option="-DDEBUG" />
+					<Add option="-DTCC_TARGET_X86_64" />
+				</Compiler>
+				<Linker>
+					<Add option="-m64" />
+				</Linker>
+			</Target>
+			<Target title="Linux64 Release Static">
+				<Option output="../bin/linux64/tcc1" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="../obj/win32/" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-m64" />
+					<Add option="-fPIC" />
+					<Add option="-DNDEBUG" />
+					<Add option="-DTCC_TARGET_X86_64" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add option="-m64" />
+				</Linker>
+			</Target>
 		</Build>
 		<Compiler>
+			<Add option="-Wextra" />
 			<Add option="-Wall" />
+			<Add option="-Wno-unused-parameter" />
 			<Add option="-DONE_SOURCE" />
 			<Add option="-DCONFIG_TCC_STATIC" />
 			<Add directory="../include" />
diff --git a/cbp/ModTCC.cbp b/cbp/ModTCC.cbp
index 2c7c3fea..78fbb202 100644
--- a/cbp/ModTCC.cbp
+++ b/cbp/ModTCC.cbp
@@ -382,8 +382,7 @@
 			<Add option="-DSQMOD_PLUGIN_API" />
 			<Add option="-DSCRAT_USE_EXCEPTIONS" />
 			<Add option="-DSCRAT_USE_CXX11_OPTIMIZATIONS" />
-			<Add option="-DTCC_IS_NATIVE" />
-			<Add option="-DTCC_TARGET_PE" />
+			<Add option="-DONE_SOURCE" />
 			<Add option="-DCONFIG_TCC_STATIC" />
 			<Add directory="../modules/tcc" />
 			<Add directory="../shared" />
@@ -391,9 +390,10 @@
 			<Add directory="../config/common" />
 			<Add directory="../external/TCC" />
 		</Compiler>
-		<Linker>
-			<Add library="tcc" />
-		</Linker>
+		<Unit filename="../external/TCC/libtcc.c">
+			<Option compilerVar="CC" />
+			<Option compiler="gcc" use="1" buildCommand="$compiler -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare -Wno-pointer-sign -Wno-missing-field-initializers -Wno-maybe-uninitialized -Wno-return-type $options $includes -c $file -o $object" />
+		</Unit>
 		<Unit filename="../modules/tcc/API.cpp" />
 		<Unit filename="../modules/tcc/Common.cpp" />
 		<Unit filename="../modules/tcc/Common.hpp" />
diff --git a/cbp/TCC.cbp b/cbp/TCC.cbp
deleted file mode 100644
index dc2eaa44..00000000
--- a/cbp/TCC.cbp
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="TCC" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Win32 Debug Static">
-				<Option output="../lib/mingw32-d/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw32-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m32" />
-					<Add option="-g" />
-					<Add option="-D_DEBUG" />
-					<Add option="-DTCC_TARGET_I386" />
-					<Add directory="../config/mingw32" />
-				</Compiler>
-				<Linker>
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Release Static">
-				<Option output="../lib/mingw32/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw32/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-DTCC_TARGET_I386" />
-					<Add directory="../config/mingw32" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Win64 Debug Static">
-				<Option output="../lib/mingw64-d/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw64-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m64" />
-					<Add option="-g" />
-					<Add option="-D_DEBUG" />
-					<Add option="-DTCC_TARGET_X86_64" />
-					<Add directory="../config/mingw64" />
-				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Win64 Release Static">
-				<Option output="../lib/mingw64/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw64/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m64" />
-					<Add option="-DNDEBUG" />
-					<Add option="-DTCC_TARGET_X86_64" />
-					<Add directory="../config/mingw64" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Linux32 Debug Static">
-				<Option output="../lib/gcc32-d/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc32-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m32" />
-					<Add option="-g" />
-					<Add option="-fPIC" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/gcc32" />
-				</Compiler>
-				<Linker>
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Linux32 Release Static">
-				<Option output="../lib/gcc32/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc32/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m32" />
-					<Add option="-fPIC" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/gcc32" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Linux64 Debug Static">
-				<Option output="../lib/gcc64-d/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc64-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m64" />
-					<Add option="-g" />
-					<Add option="-fPIC" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/gcc64" />
-				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Linux64 Release Static">
-				<Option output="../lib/gcc64/tcc" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc64/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m64" />
-					<Add option="-fPIC" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/gcc64" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="-Wno-unused-function" />
-			<Add option="-DONE_SOURCE" />
-			<Add option="-DTCC_IS_NATIVE" />
-			<Add option="-DTCC_TARGET_PE" />
-			<Add option="-DCONFIG_TCC_STATIC" />
-			<Add directory="../include" />
-			<Add directory="../external/TCC" />
-			<Add directory="../config/common" />
-		</Compiler>
-		<Unit filename="../external/TCC/libtcc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/cbp/default.workspace b/cbp/default.workspace
index f7df6939..10a9093d 100644
--- a/cbp/default.workspace
+++ b/cbp/default.workspace
@@ -11,7 +11,6 @@
 		<Project filename="ModMMDB.cbp" />
 		<Project filename="ModSample.cbp" />
 		<Project filename="ModTCC.cbp" />
-		<Project filename="TCC.cbp" />
 		<Project filename="LibTCC.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>