Browse Source

Change code to match original MSVC

Ginger Bill 8 năm trước cách đây
mục cha
commit
3a3202fbc6
3 tập tin đã thay đổi với 9 bổ sung8 xóa
  1. 2 1
      .gitignore
  2. 1 2
      misc/shell.bat
  3. 6 5
      src/gb/gb.h

+ 2 - 1
.gitignore

@@ -256,7 +256,8 @@ paket-files/
 *.sln
 *.sln
 builds/
 builds/
 bin/
 bin/
+*.exe
 
 
 # - Linux/MacOS
 # - Linux/MacOS
 odin
 odin
-odin.dSYM
+odin.dSYM

+ 1 - 2
misc/shell.bat

@@ -1,7 +1,6 @@
 @echo off
 @echo off
 
 
-rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 1> NUL
-call     "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 1> NUL
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 1> NUL
 rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 1> NUL
 rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 1> NUL
 set _NO_DEBUG_HEAP=1
 set _NO_DEBUG_HEAP=1
 
 

+ 6 - 5
src/gb/gb.h

@@ -4873,7 +4873,7 @@ GB_ALLOCATOR_PROC(gb_heap_allocator_proc) {
 	case gbAllocation_Resize: {
 	case gbAllocation_Resize: {
 		ptr = realloc(old_memory, size);
 		ptr = realloc(old_memory, size);
 		// ptr = gb_default_resize_align(gb_heap_allocator(), old_memory, old_size, size, alignment);
 		// ptr = gb_default_resize_align(gb_heap_allocator(), old_memory, old_size, size, alignment);
-	} break;	
+	} break;
 #else
 #else
 	// TODO(bill): *nix version that's decent
 	// TODO(bill): *nix version that's decent
 	case gbAllocation_Alloc: {
 	case gbAllocation_Alloc: {
@@ -5086,7 +5086,7 @@ void gb_affinity_init(gbAffinity *a) {
 			}
 			}
 #undef AF__CHECK
 #undef AF__CHECK
 		}
 		}
-		
+
 		fclose(cpu_info);
 		fclose(cpu_info);
 	}
 	}
 
 
@@ -7619,10 +7619,11 @@ gbFileError gb_file_close(gbFile *f) {
 		return gbFileError_Invalid;
 		return gbFileError_Invalid;
 	}
 	}
 
 
-	//
+#if defined(GB_COMPILER_MSVC)
+	if (f->filename) gb_free(gb_heap_allocator(), cast(char *)f->filename);
+#else
 	// TODO HACK(bill): Memory Leak!!!
 	// TODO HACK(bill): Memory Leak!!!
-	// if (f->filename) gb_free(gb_heap_allocator(), cast(char *)f->filename);
-	//
+#endif
 
 
 #if defined(GB_SYSTEM_WINDOWS)
 #if defined(GB_SYSTEM_WINDOWS)
 	if (f->fd.p == INVALID_HANDLE_VALUE) {
 	if (f->fd.p == INVALID_HANDLE_VALUE) {