Author: titmuss
Date: Wed Jan 16 04:48:11 2008
New Revision: 1461
URL: http://svn.slimdevices.com?rev=1461&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fixes to the windows build process. Thanks to rickwookie.
Removed:
trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/Version.rc
trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/Version.rc
Modified:
trunk/jive/src/pkg/SDL-1.2.11/VisualC/SDL/SDL.vcproj
trunk/jive/src/pkg/SDL_gfx-2.0.15/VisualC/SDL_gfx.vcproj
trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/SDL_image.vcproj
trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/SDL_ttf.vcproj
trunk/jive/src/pkg/jive/VisualC/jive.vcproj
trunk/jive/src/pkg/lua-5.1.1/VisualC/lua.vcproj
trunk/jive/src/pkg/luafilesystem-1.2/VisualC/luafilesystem_dll.vcproj
trunk/jive/src/pkg/luajson/VisualC/json.vcproj
trunk/jive/src/pkg/luaprofiler-2.0/VisualC/luaprofiler.vcproj
trunk/jive/src/pkg/luasocket-2.0.1/mime.vcproj
trunk/jive/src/pkg/luasocket-2.0.1/socket.vcproj
Modified: trunk/jive/src/pkg/SDL-1.2.11/VisualC/SDL/SDL.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/SDL-1.2.11/VisualC/SDL/SDL.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/SDL-1.2.11/VisualC/SDL/SDL.vcproj (original)
+++ trunk/jive/src/pkg/SDL-1.2.11/VisualC/SDL/SDL.vcproj Wed Jan 16 04:48:11
2008
@@ -147,7 +147,7 @@
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\..\include;..\include;"C:\Program
Files\Microsoft DirectX SDK (February 2007)\Include""
-
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
+
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_WIN32_WINNT=0x0400"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
Modified: trunk/jive/src/pkg/SDL_gfx-2.0.15/VisualC/SDL_gfx.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/SDL_gfx-2.0.15/VisualC/SDL_gfx.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/SDL_gfx-2.0.15/VisualC/SDL_gfx.vcproj (original)
+++ trunk/jive/src/pkg/SDL_gfx-2.0.15/VisualC/SDL_gfx.vcproj Wed Jan 16
04:48:11 2008
@@ -115,7 +115,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""..\..\SDL-1.2.11\VisualC\include";"..\..\SDL-1.2.11\include""
-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_DLL"
+
PreprocessorDefinitions="WIN32;_CONSOLE;BUILD_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Modified: trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/SDL_image.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/SDL_image.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/SDL_image.vcproj (original)
+++ trunk/jive/src/pkg/SDL_image-1.2.5/VisualC/SDL_image.vcproj Wed Jan 16
04:48:11 2008
@@ -144,7 +144,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""..\..\SDL-1.2.11\include";"..\..\SDL-1.2.11\VisualC\include";graphics\include"
-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\"jpeg.dll\";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\"libpng12.dll\";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\"libtiff.dll\";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;_CRT_SECURE_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC=\"jpeg.dll\";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC=\"libpng12.dll\";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC=\"libtiff.dll\";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -530,26 +530,6 @@
RelativePath="..\showimage.c"
>
</File>
- <File
- RelativePath="Version.rc"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
</Filter>
<Filter
Name="SDL_image Headers"
Modified: trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/SDL_ttf.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/SDL_ttf.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/SDL_ttf.vcproj (original)
+++ trunk/jive/src/pkg/SDL_ttf-2.0.8/VisualC/SDL_ttf.vcproj Wed Jan 16 04:48:11
2008
@@ -237,26 +237,6 @@
/>
</FileConfiguration>
</File>
- <File
- RelativePath="Version.rc"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
</Files>
<Globals>
</Globals>
Modified: trunk/jive/src/pkg/jive/VisualC/jive.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/VisualC/jive.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/VisualC/jive.vcproj (original)
+++ trunk/jive/src/pkg/jive/VisualC/jive.vcproj Wed Jan 16 04:48:11 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..\src;..\src\jiveui;"..\..\SDL-1.2.11\include";"..\..\SDL-1.2.11\VisualC\include";"..\..\SDL_image-1.2.5";"..\..\SDL_ttf-2.0.8";"..\..\SDL_gfx-2.0.15";"..\..\lua-5.1.1\src";"..\..\tolua++-1.0.92\include""
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Modified: trunk/jive/src/pkg/lua-5.1.1/VisualC/lua.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/lua-5.1.1/VisualC/lua.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/lua-5.1.1/VisualC/lua.vcproj (original)
+++ trunk/jive/src/pkg/lua-5.1.1/VisualC/lua.vcproj Wed Jan 16 04:48:11 2008
@@ -115,7 +115,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;LUA_BUILD_AS_DLL;LUATHREAD_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;LUA_EXPORTS;LUA_BUILD_AS_DLL;LUATHREAD_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Modified: trunk/jive/src/pkg/luafilesystem-1.2/VisualC/luafilesystem_dll.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luafilesystem-1.2/VisualC/luafilesystem_dll.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/luafilesystem-1.2/VisualC/luafilesystem_dll.vcproj
(original)
+++ trunk/jive/src/pkg/luafilesystem-1.2/VisualC/luafilesystem_dll.vcproj Wed
Jan 16 04:48:11 2008
@@ -50,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""..\..\lua-5.1.1\src""
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUAFILESYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;LUAFILESYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Modified: trunk/jive/src/pkg/luajson/VisualC/json.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luajson/VisualC/json.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/luajson/VisualC/json.vcproj (original)
+++ trunk/jive/src/pkg/luajson/VisualC/json.vcproj Wed Jan 16 04:48:11 2008
@@ -117,7 +117,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""..\..\lua-5.1.1\src";include"
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JSON_EXPORTS;LUAJSON_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;JSON_EXPORTS;LUAJSON_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Modified: trunk/jive/src/pkg/luaprofiler-2.0/VisualC/luaprofiler.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luaprofiler-2.0/VisualC/luaprofiler.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/luaprofiler-2.0/VisualC/luaprofiler.vcproj (original)
+++ trunk/jive/src/pkg/luaprofiler-2.0/VisualC/luaprofiler.vcproj Wed Jan 16
04:48:11 2008
@@ -103,7 +103,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;"..\..\lua-5.1.1\src""
-
PreprocessorDefinitions="WIN32;LUAPROFILER_API=__declspec(dllexport);_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;LUAPROFILER_API=__declspec(dllexport);_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
/>
<Tool
Name="VCManagedResourceCompilerTool"
Modified: trunk/jive/src/pkg/luasocket-2.0.1/mime.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luasocket-2.0.1/mime.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/luasocket-2.0.1/mime.vcproj (original)
+++ trunk/jive/src/pkg/luasocket-2.0.1/mime.vcproj Wed Jan 16 04:48:11 2008
@@ -122,7 +122,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""..\lua-5.1.1\src""
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_EXPORTS;MIME_API=__declspec(dllexport)"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MIME_EXPORTS;MIME_API=__declspec(dllexport)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: trunk/jive/src/pkg/luasocket-2.0.1/socket.vcproj
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luasocket-2.0.1/socket.vcproj?rev=1461&root=Jive&r1=1460&r2=1461&view=diff
==============================================================================
--- trunk/jive/src/pkg/luasocket-2.0.1/socket.vcproj (original)
+++ trunk/jive/src/pkg/luasocket-2.0.1/socket.vcproj Wed Jan 16 04:48:11 2008
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""..\lua-5.1.1\src""
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
+
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins