Browse Source

Fix WIN32 complation bug & not specify SDL version for WIN32 & fix switch menu display bug

louyihua 8 years ago
parent
commit
5ec7fae05b
3 changed files with 6 additions and 5 deletions
  1. 1 1
      uigame.c
  2. 4 4
      win32/sdlpal.vcxproj
  3. 1 0
      win32/win32.cpp

+ 1 - 1
uigame.c

@@ -287,7 +287,7 @@ PAL_SelectionMenu(
 	dx[1] = dx[0]; dx[3] = dx[2]; dx[0] = dx[2] = 0;
 	for (i = 0; i < nWords; i++)
 	{
-		rgpBox[i] = PAL_CreateSingleLineBox(PAL_XY(130 + 75 * (i % 2), 100 + 40 * (i / 2)), w[i] + 1, TRUE);
+		rgpBox[i] = PAL_CreateSingleLineBox(PAL_XY(130 + 75 * (i % 2) + dx[i], 100 + 40 * (i / 2)), w[i] + 1, TRUE);
 	}
 
 	VIDEO_UpdateScreen(&rect);

+ 4 - 4
win32/sdlpal.vcxproj

@@ -43,12 +43,12 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>..\..\SDL2-2.0.3\include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\SDL2-2.0.3\lib\x86;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\SDL2\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\SDL2\lib\x86;..\SDL2\VisualC\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>..\..\SDL2-2.0.3\include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\SDL2-2.0.3\lib\x86;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\SDL2\include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\SDL2\lib\x86;..\SDL2\VisualC\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>

+ 1 - 0
win32/win32.cpp

@@ -10,6 +10,7 @@
 #include "resource.h"
 #include "../global.h"
 #include "../util.h"
+#include "../palcfg.h"
 
 #pragma comment(lib, "comctl32.lib")
 #pragma comment(linker,"\"/manifestdependency:type='win32' \