update premake4.lua for recent changes

tplunket · Jul 4, 2015 · 65b70d0 · 65b70d0
1 parent f14720a
commit 65b70d0
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 215 deletions.
diff --git a/premake4.lua b/premake4.lua
@@ -31,15 +31,13 @@ function solution_common()
      defines { "NDEBUG", "KJK_BUILD" }
 
   configuration {"vs*"}
-    -- defines { "_WIN32", "WIN32", "WINDOWS", "_CRT_SECURE_NO_WARNINGS" }
     defines { "_WIN32", "WIN32", "WINDOWS", "_CRT_SECURE_NO_WARNINGS" }
-    -- 4800 - int -> bool coversion
-    -- 4127 - conditional expression is constant
-    -- 4100 - unreferenced formal parameter
-    -- 4244 - possible loss of data due to conversion
-    -- /MP  - use multi-cores for compilation
+
     buildoptions {
-        "/wd4800", "/wd4127", "/wd4100", "/wd4244"
+        "/wd4800", -- 4800 - int -> bool coversion
+        "/wd4127", -- 4127 - conditional expression is constant
+        "/wd4100", -- 4100 - unreferenced formal parameter
+        "/wd4244", -- 4244 - possible loss of data due to conversion
     }
 end
 
@@ -62,53 +60,62 @@ solution "ag"
       -- /TP  - compile as c++
       buildoptions { "/TP" }
 
-    defines { "PCRE_STATIC" }
-    includedirs { "src", "wincompat", "wincompat/zlib", "wincompat/pcre-8.32",
-    "wincompat/pthread-win32" }
+    defines { "PCRE_STATIC", "PTW32_STATIC_LIB" }
+    includedirs { "src", "wincompat", "wincompat/zlib", "wincompat/pcre",
+    "wincompat/pthread" }
     linkoptions {"/NODEFAULTLIB:\"msvcrt.lib\""}
     links { "Shlwapi", "zlib", "pthread-win32", "pcre" }
 
   project "pcre"
     kind "StaticLib"
     language "C"
     defines { "HAVE_CONFIG_H" }
-    files {
-      "wincompat/pcre-8.32/pcre_byte_order.c",
-      "wincompat/pcre-8.32/pcre_chartables.c",
-      "wincompat/pcre-8.32/pcre_compile.c",
-      "wincompat/pcre-8.32/pcre_config.c",
-      "wincompat/pcre-8.32/pcre_dfa_exec.c",
-      "wincompat/pcre-8.32/pcre_exec.c",
-      "wincompat/pcre-8.32/pcre_fullinfo.c",
-      "wincompat/pcre-8.32/pcre_get.c",
-      "wincompat/pcre-8.32/pcre_globals.c",
-      "wincompat/pcre-8.32/pcre_jit_compile.c",
-      "wincompat/pcre-8.32/pcre_maketables.c",
-      "wincompat/pcre-8.32/pcre_newline.c",
-      "wincompat/pcre-8.32/pcre_ord2utf8.c",
-      "wincompat/pcre-8.32/pcre_refcount.c",
-      "wincompat/pcre-8.32/pcre_string_utils.c",
-      "wincompat/pcre-8.32/pcre_study.c",
-      "wincompat/pcre-8.32/pcre_tables.c",
-      "wincompat/pcre-8.32/pcre_ucd.c",
-      "wincompat/pcre-8.32/pcre_valid_utf8.c",
-      "wincompat/pcre-8.32/pcre_version.c",
-      "wincompat/pcre-8.32/pcre_xclass.c",
+    configuration {"vs*"}
+      buildoptions {
+          "/wd4018", -- signed/unsigned mismatch
+          "/wd4146", -- unary minus applied to unsigned type
+      }
+
+        files {
+      "wincompat/pcre/pcre_byte_order.c",
+      "wincompat/pcre/pcre_chartables.c",
+      "wincompat/pcre/pcre_compile.c",
+      "wincompat/pcre/pcre_config.c",
+      "wincompat/pcre/pcre_dfa_exec.c",
+      "wincompat/pcre/pcre_exec.c",
+      "wincompat/pcre/pcre_fullinfo.c",
+      "wincompat/pcre/pcre_get.c",
+      "wincompat/pcre/pcre_globals.c",
+      "wincompat/pcre/pcre_jit_compile.c",
+      "wincompat/pcre/pcre_maketables.c",
+      "wincompat/pcre/pcre_newline.c",
+      "wincompat/pcre/pcre_ord2utf8.c",
+      "wincompat/pcre/pcre_refcount.c",
+      "wincompat/pcre/pcre_string_utils.c",
+      "wincompat/pcre/pcre_study.c",
+      "wincompat/pcre/pcre_tables.c",
+      "wincompat/pcre/pcre_ucd.c",
+      "wincompat/pcre/pcre_valid_utf8.c",
+      "wincompat/pcre/pcre_version.c",
+      "wincompat/pcre/pcre_xclass.c",
     }
-    includedirs { "wincompat/pcre-8.32" }
+    includedirs { "wincompat/pcre" }
 
   project "zlib"
      kind "StaticLib"
      language "C"
      files { "wincompat/zlib/*.c", "wincompat/zlib/*.h" }
      excludes { "wincompat/zlib/gzclose.c", "wincompat/zlib/gzread.c", "wincompat/zlib/gzwrite.c", "wincompat/zlib/gzlib.c"}
      includedirs { "wincompat/zlib" }
+     defines { "Z_SOLO" }
 
   project "pthread-win32"
      kind "StaticLib"
      language "C"
      files {
-        "wincompat/pthread-win32/*.h",
-        "wincompat/pthread-win32/pthread.c"
+        "wincompat/pthread/*.h",
+        "wincompat/pthread/pthread.c"
      }
-     includedirs { "wincompat/pthread-win32" }
+     includedirs { "wincompat/pthread" }
+     defines { 'PTW32_BUILD_INLINED', 'PTW32_STATIC_LIB', '__CLEANUP_C',
+}
diff --git a/premake5.lua b/premake5.lua
@@ -3,7 +3,7 @@
 
 solution 'ag'
     configurations { 'Debug', 'Release', 'ReleaseKjk' }
-    location 'build' -- this is where generated solution/project files go
+    location 'vs-premake5' -- this is where generated solution/project files go
     flags { 'StaticRuntime', 'NoRTTI', 'Unicode', 'NoExceptions', }
     defines {
         -- windows
@@ -98,4 +98,3 @@ project 'dependlib'
             'wincompat/pch.h',
             'wincompat/pch.c',
         }
-
diff --git a/vs-premake/ag.sln b/vs-premake/ag.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ag", "ag.vcxproj", "{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ag", "ag.vcxproj", "{28A6DFC4-277B-5D49-B9F3-B82440025632}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F} = {2E5CDF48-C3C6-7549-8470-75B14362F40F}
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD} = {F9D0F471-B5DE-584B-A15D-7BDA985A92AD}
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924} = {A0D52E1F-F511-544B-BC39-F8D592E7C924}
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695} = {6A4DCE3D-DE29-F343-BB09-6106BF4F2695}
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0} = {EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E} = {02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcxproj", "{A0D52E1F-F511-544B-BC39-F8D592E7C924}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcxproj", "{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{2E5CDF48-C3C6-7549-8470-75B14362F40F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread-win32", "pthread-win32.vcxproj", "{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread-win32", "pthread-win32.vcxproj", "{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,30 +21,30 @@ Global
 		ReleaseKjk|Win32 = ReleaseKjk|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.Debug|Win32.Build.0 = Debug|Win32
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.Release|Win32.ActiveCfg = Release|Win32
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.Release|Win32.Build.0 = Release|Win32
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
-		{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.Debug|Win32.Build.0 = Debug|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.Release|Win32.ActiveCfg = Release|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.Release|Win32.Build.0 = Release|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
-		{A0D52E1F-F511-544B-BC39-F8D592E7C924}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.Debug|Win32.Build.0 = Debug|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.Release|Win32.ActiveCfg = Release|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.Release|Win32.Build.0 = Release|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
-		{2E5CDF48-C3C6-7549-8470-75B14362F40F}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.Debug|Win32.Build.0 = Debug|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.Release|Win32.ActiveCfg = Release|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.Release|Win32.Build.0 = Release|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
-		{F9D0F471-B5DE-584B-A15D-7BDA985A92AD}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.Debug|Win32.ActiveCfg = Debug|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.Debug|Win32.Build.0 = Debug|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.Release|Win32.ActiveCfg = Release|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.Release|Win32.Build.0 = Release|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
+		{28A6DFC4-277B-5D49-B9F3-B82440025632}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.Debug|Win32.Build.0 = Debug|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.Release|Win32.ActiveCfg = Release|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.Release|Win32.Build.0 = Release|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
+		{02ED9E6D-6E3E-0843-B5FB-8238EB3FB14E}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.Debug|Win32.Build.0 = Debug|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.Release|Win32.ActiveCfg = Release|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.Release|Win32.Build.0 = Release|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
+		{6A4DCE3D-DE29-F343-BB09-6106BF4F2695}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.Debug|Win32.Build.0 = Debug|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.Release|Win32.ActiveCfg = Release|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.Release|Win32.Build.0 = Release|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.ReleaseKjk|Win32.ActiveCfg = ReleaseKjk|Win32
+		{EEBB2E2E-0370-924D-B0B0-BA9462CD8BE0}.ReleaseKjk|Win32.Build.0 = ReleaseKjk|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/vs-premake/ag.vcxproj b/vs-premake/ag.vcxproj
@@ -15,7 +15,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D05D932F-8C7F-1F44-BFDB-F5985243D8A9}</ProjectGuid>
+    <ProjectGuid>{28A6DFC4-277B-5D49-B9F3-B82440025632}</ProjectGuid>
     <RootNamespace>ag</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
@@ -72,8 +72,8 @@
     <ClCompile>
       <AdditionalOptions>/wd4800 /wd4127 /wd4100 /wd4244 /TP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -86,8 +86,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;..\dbg\zlib.lib;..\dbg\pthread-win32.lib;..\dbg\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -105,8 +105,8 @@
     <ClCompile>
       <AdditionalOptions>/wd4800 /wd4127 /wd4100 /wd4244 /TP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -119,8 +119,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;..\rel\zlib.lib;..\rel\pthread-win32.lib;..\rel\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -140,8 +140,8 @@
     <ClCompile>
       <AdditionalOptions>/wd4800 /wd4127 /wd4100 /wd4244 /TP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;KJK_BUILD;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;KJK_BUILD;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -154,8 +154,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;KJK_BUILD;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre-8.32;..\wincompat\pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;KJK_BUILD;_WIN32;WIN32;WINDOWS;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\wincompat;..\wincompat\zlib;..\wincompat\pcre;..\wincompat\pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;..\rel\zlib.lib;..\rel\pthread-win32.lib;..\rel\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/vs-premake/ag.vcxproj.filters b/vs-premake/ag.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="src">
-			<UniqueIdentifier>{FDA3073D-C440-F94E-A81D-778DEC3EDB27}</UniqueIdentifier>
+			<UniqueIdentifier>{01270C5B-DA4A-C54E-B68B-6D9B60E53D82}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="wincompat">
-			<UniqueIdentifier>{110A056C-14BC-794F-A3F1-9DB99CD4A4C0}</UniqueIdentifier>
+			<UniqueIdentifier>{6127D2AE-3534-B94D-9E29-8E08E5B462E0}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>