Milton 1.2.6 for reals

serge-rgb · Oct 5, 2016 · a93e281 · a93e281
1 parent 470a882
commit a93e281
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/Milton.iss b/Milton.iss
@@ -9,9 +9,9 @@ DefaultGroupName=Milton
 ;UninstallDisplayIcon={app}\Milton.exe
 Compression=lzma2
 SolidCompression=yes
-OutputBaseFilename=MiltonSetup_1.2.6
-ArchitecturesAllowed=x64
-ArchitecturesInstallIn64BitMode=x64
+OutputBaseFilename=MiltonSetup_1.2.6_x86
+;ArchitecturesAllowed=x64
+;ArchitecturesInstallIn64BitMode=x64
 
 [Files]
 Source: "Milton.exe"; DestDir: "{app}"

diff --git a/scripts/vcvars.bat b/scripts/vcvars.bat
@@ -1,3 +1,4 @@
 @echo off
 
-"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+::"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
diff --git a/src/DArray.h b/src/DArray.h
@@ -37,7 +37,7 @@ void grow(DArray<T>* arr)
     }
     if (arr->data)
     {
-        arr->data = (T*)mlt_realloc(arr->data, arr->capacity*sizeof(T));
+        arr->data = (T*)mlt_realloc(arr->data, (size_t)(arr->capacity*sizeof(T)));
         if (arr->data == NULL)
         {
             milton_die_gracefully("Milton ran out of memory :(");

diff --git a/src/milton_configuration.h b/src/milton_configuration.h
@@ -16,7 +16,7 @@
 
 #define MILTON_ZOOM_DEBUG 0
     // If MILTON_DEBUG is 0, MILTON_ZOOM_DEBUG will be 0 too!
-    #if !MILTON_DEBUG
+#if !MILTON_DEBUG
         #undef MILTON_ZOOM_DEBUG
         #define MILTON_ZOOM_DEBUG 0
     #endif
@@ -34,7 +34,7 @@
 
 #define MILTON_MULTITHREADED 1
 
-#define MILTON_ENABLE_PROFILING 1
+#define MILTON_ENABLE_PROFILING 0
 
 #define MAX_NUM_WORKERS 64
 // Force things to be a bit slower

diff --git a/src/platform_unix.cc b/src/platform_unix.cc
@@ -67,7 +67,7 @@ void milton_fatal(char* message)
 void milton_die_gracefully(char* message)
 {
     milton_log("*** [FATAL] ***: \n\t");
-    puts(message);
+    milton_log(message);
     exit(EXIT_FAILURE);
 }
 

diff --git a/src/platform_windows.cc b/src/platform_windows.cc
@@ -47,7 +47,7 @@ extern "C"
 #endif  // NTDDI_WINXP
 #define CSIDL_FLAG_MASK                 0xFF00        // mask for all possible flag values
 
-HRESULT SHGetFolderPathW(__reserved HWND hwnd, __in int csidl, __in_opt HANDLE hToken, __in DWORD dwFlags, __out_ecount(MAX_PATH) LPWSTR pszPath);
+HRESULT WINAPI SHGetFolderPathW(__reserved HWND hwnd, __in int csidl, __in_opt HANDLE hToken, __in DWORD dwFlags, __out_ecount(MAX_PATH) LPWSTR pszPath);
 
 
     //*
@@ -62,7 +62,7 @@ HRESULT SHGetFolderPathW(__reserved HWND hwnd, __in int csidl, __in_opt HANDLE h
 #define snprintf sprintf_s
 #endif
 
-#if MILTON_DEBUG
+#if MILTON_DEBUG && 0  // Disabled. Milton 1.2.6 x86
 #define HEAP_BEGIN_ADDRESS ((LPVOID)(1<<18))  // Location to begin allocations
 #else
 #define HEAP_BEGIN_ADDRESS NULL
@@ -162,7 +162,7 @@ void win32_log(char *format, ...)
 void milton_fatal(char* message)
 {
     milton_log("*** [FATAL] ***: \n\t");
-    puts(message);
+    milton_log(message);
     exit(EXIT_FAILURE);
 }
 

diff --git a/third_party/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj b/third_party/SDL2-2.0.3/VisualC/SDL/SDL_VS2013.vcxproj
@@ -44,7 +44,7 @@
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
@@ -129,7 +129,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/third_party/SDL2-2.0.3/VisualC/SDL_VS2013.sln b/third_party/SDL2-2.0.3/VisualC/SDL_VS2013.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
 EndProject
@@ -127,10 +127,10 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32

diff --git a/third_party/bin/x86/SDL2.lib b/third_party/bin/x86/SDL2.lib
diff --git a/third_party/bin/x86/SDL2.pdb b/third_party/bin/x86/SDL2.pdb