Renamed msvc into win32.

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

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>

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

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>

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"

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>

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>

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>

msvc/config.h → 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
+#define snprintf _snprintf