Support import files as modules (i.e. import only once)

build.bat

@@ -1,6 +1,5 @@
 @echo off
 
-set base_dir=W:\Odin
 :: Make sure this is a decent name and not generic
 set exe_name=odin.exe
 
@@ -23,38 +22,8 @@ set compiler_warnings= ^
 	-wd4480 ^
 	-wd4505 -wd4512 -wd4550
 
-set compiler_includes=-I"C:\Program Files\LLVM\include"
-
-set libs= kernel32.lib user32.lib gdi32.lib opengl32.lib ^
-	-libpath:"C:\Program Files\LLVM\lib"
-
-	rem LLVMX86Disassembler.lib ^
-	rem LLVMX86AsmParser.lib ^
-	rem LLVMX86CodeGen.lib ^
-	rem LLVMSelectionDAG.lib ^
-	rem LLVMAsmPrinter.lib ^
-	rem LLVMCodeGen.lib ^
-	rem LLVMTarget.lib ^
-	rem LLVMScalarOpts.lib ^
-	rem LLVMInstCombine.lib ^
-	rem LLVMInstrumentation.lib ^
-	rem LLVMProfileData.lib ^
-	rem LLVMTransformUtils.lib ^
-	rem LLVMBitWriter.lib ^
-	rem LLVMAnalysis.lib ^
-	rem LLVMX86Desc.lib ^
-	rem LLVMObject.lib ^
-	rem LLVMMCParser.lib ^
-	rem LLVMBitReader.lib ^
-	rem LLVMMCDisassembler.lib ^
-	rem LLVMX86Info.lib ^
-	rem LLVMX86AsmPrinter.lib ^
-	rem LLVMMC.lib ^
-	rem LLVMX86Utils.lib ^
-	rem LLVMCore.lib ^
-	rem LLVMSupport.lib
-
-
+set compiler_includes=
+set libs= kernel32.lib user32.lib gdi32.lib opengl32.lib
 
 set linker_flags= -incremental:no -opt:ref -subsystem:console
 
@@ -65,7 +34,7 @@ set compiler_settings=%compiler_includes% %compiler_flags% %compiler_warnings%
 set linker_settings=%libs% %linker_flags%
 
 
-set build_dir= "%base_dir%\bin\"
+set build_dir= "bin\"
 if not exist %build_dir% mkdir %build_dir%
 pushd %build_dir%
 	del *.pdb > NUL 2> NUL
@@ -74,9 +43,9 @@ pushd %build_dir%
 	del ..\misc\*.pdb > NUL 2> NUL
 	del ..\misc\*.ilk > NUL 2> NUL
 
-	cl %compiler_settings% "%base_dir%\src\main.cpp" ^
+	cl %compiler_settings% "..\src\main.cpp" ^
 		/link %linker_settings% -OUT:%exe_name% ^
-		&& call run.bat
+		&& call ..\run.bat
 
 	:do_not_compile_exe
 popd