From e8f04805fd11ec5a55a1e276974902e76a0ee508 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 7 Oct 2008 23:27:41 +0000
Subject: [PATCH] Renamed msvc into win32.

---
 Makefile.am                  | 2 +-
 caca/libcaca.vcproj          | 8 ++++----
 configure.ac                 | 2 +-
 cxx/libcaca++.vcproj         | 6 +++---
 cxx/test-cxx.vcproj          | 4 ++--
 src/cacademo.vcproj          | 6 +++---
 src/cacafire.vcproj          | 6 +++---
 src/cacaview.vcproj          | 6 +++---
 {msvc => win32}/Makefile.am  | 0
 {msvc => win32}/caca_types.h | 0
 {msvc => win32}/config.h     | 8 +++-----
 11 files changed, 23 insertions(+), 25 deletions(-)
 rename {msvc => win32}/Makefile.am (100%)
 rename {msvc => win32}/caca_types.h (100%)
 rename {msvc => win32}/config.h (91%)

diff --git a/Makefile.am b/Makefile.am
index 4bf9298..7102523 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 SUBDIRS = kernel caca src examples tests tools csharp cxx python ruby doc
-DIST_SUBDIRS = $(SUBDIRS) msvc
+DIST_SUBDIRS = $(SUBDIRS) win32
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec
 AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/caca/libcaca.vcproj b/caca/libcaca.vcproj
index ad2b210..c39be23 100644
--- a/caca/libcaca.vcproj
+++ b/caca/libcaca.vcproj
@@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc"
+				AdditionalIncludeDirectories="..\win32"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\msvc"
+				AdditionalIncludeDirectories="..\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -186,11 +186,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\msvc\caca_types.h"
+				RelativePath="..\win32\caca_types.h"
 				>
 			</File>
 			<File
-				RelativePath="..\msvc\config.h"
+				RelativePath="..\win32\config.h"
 				>
 			</File>
 		</Filter>
diff --git a/configure.ac b/configure.ac
index f8533fc..3bba0f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,7 +494,7 @@ AC_CONFIG_FILES([
   python/Makefile
   ruby/Makefile
   doc/Makefile
-  msvc/Makefile
+  win32/Makefile
 ])
 AC_CONFIG_FILES([
   caca/caca_types.h
diff --git a/cxx/libcaca++.vcproj b/cxx/libcaca++.vcproj
index 087b515..9261de6 100644
--- a/cxx/libcaca++.vcproj
+++ b/cxx/libcaca++.vcproj
@@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA_PP__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA_PP__"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,7 +178,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\msvc\config.h"
+				RelativePath="..\win32\config.h"
 				>
 			</File>
 		</Filter>
diff --git a/cxx/test-cxx.vcproj b/cxx/test-cxx.vcproj
index f0e132e..5aae326 100755
--- a/cxx/test-cxx.vcproj
+++ b/cxx/test-cxx.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\msvc;..\caca"
+				AdditionalIncludeDirectories=".;..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..\msvc;..\caca"
+				AdditionalIncludeDirectories=".;..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/src/cacademo.vcproj b/src/cacademo.vcproj
index 2b9020d..81ad445 100644
--- a/src/cacademo.vcproj
+++ b/src/cacademo.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -125,7 +125,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -189,7 +189,7 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\msvc\config.h"
+				RelativePath="..\win32\config.h"
 				>
 			</File>
 		</Filter>
diff --git a/src/cacafire.vcproj b/src/cacafire.vcproj
index 42c2734..1b6a6b0 100644
--- a/src/cacafire.vcproj
+++ b/src/cacafire.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -188,7 +188,7 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\msvc\config.h"
+				RelativePath="..\win32\config.h"
 				>
 			</File>
 		</Filter>
diff --git a/src/cacaview.vcproj b/src/cacaview.vcproj
index 1ef85b2..c9c0880 100644
--- a/src/cacaview.vcproj
+++ b/src/cacaview.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="..\win32;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\msvc"
+				AdditionalIncludeDirectories="..\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -193,7 +193,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\msvc\config.h"
+				RelativePath="..\win32\config.h"
 				>
 			</File>
 		</Filter>
diff --git a/msvc/Makefile.am b/win32/Makefile.am
similarity index 100%
rename from msvc/Makefile.am
rename to win32/Makefile.am
diff --git a/msvc/caca_types.h b/win32/caca_types.h
similarity index 100%
rename from msvc/caca_types.h
rename to win32/caca_types.h
diff --git a/msvc/config.h b/win32/config.h
similarity index 91%
rename from msvc/config.h
rename to win32/config.h
index c6799fc..34d89fc 100644
--- a/msvc/config.h
+++ b/win32/config.h
@@ -36,12 +36,11 @@
 #define HAVE_WINDOWS_H 1
 /* #undef HAVE_X11_XKBLIB_H */
 /* #undef NO_MINUS_C_MINUS_O */
-#define PACKAGE "libcaca"
 #define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "libcaca"
 #define PACKAGE_STRING ""
 #define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "0.99.beta15"
 /* #undef RETSIGTYPE */
 /* #undef SCREENUPDATE_IN_PC_H */
 #define STDC_HEADERS 1
@@ -50,10 +49,9 @@
 /* #undef USE_SLANG */
 #define USE_WIN32 1
 /* #undef USE_X11 */
-#define VERSION "0.99.beta14"
 /* #undef const */
 #ifndef __cplusplus
 #define inline __inline
 #endif
 #define strcasecmp stricmp
-#define snprintf _snprintf
\ No newline at end of file
+#define snprintf _snprintf