- Fix for Bug 1113 (Topsun)

[xonotic/netradiant.git] / radiant / GtkRadiant.vcproj

diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj
index 1264a5b1e0c246504004617d1caa6a44df1718ea..b8a849e01db0d692c919e1748b1cd7a57514df16 100644 (file)
--- a/radiant/GtkRadiant.vcproj
+++ b/radiant/GtkRadiant.vcproj
@@ -20,7 +20,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                StringPooling="TRUE"\r
                                MinimalRebuild="TRUE"\r
@@ -43,7 +43,7 @@
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/debug/&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"\r
                                IgnoreAllDefaultLibraries="TRUE"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                GenerateDebugInformation="TRUE"\r
@@ -52,7 +52,8 @@
                                GenerateMapFile="FALSE"\r
                                SubSystem="2"\r
                                EntryPointSymbol="mainCRTStartup"\r
-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               FixedBaseAddress="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
@@ -93,7 +94,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForWindowsApplication="TRUE"\r
-                               AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../include;../libs;&quot;../../STLPort-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;;&quot;../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../gtk2-2.4/include/gtkglext-1.0&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
@@ -113,7 +114,7 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/win32/lib&quot;;&quot;../libs/profile/release/&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../gtk2-2.4/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"\r
                                IgnoreAllDefaultLibraries="TRUE"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                GenerateDebugInformation="TRUE"\r
@@ -548,6 +549,12 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                        <File\r
                                RelativePath=".\shaders.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\sockets.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\sockets.h">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\stacktrace.cpp">\r
                        </File>\r
@@ -669,6 +676,9 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot;  &quot;$(SolutionDir)install&quot
                                        Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"/>\r
                        </FileConfiguration>\r
                </File>\r
+               <File\r
+                       RelativePath="..\install.py">\r
+               </File>\r
                <File\r
                        RelativePath=".\radiant.ico">\r
                </File>\r