Reorganise MSVC files so that each project is with its source code.

caca/Makefile.am

@@ -1,100 +1,102 @@
-# $Id$
-
-EXTRA_DIST = caca_types.h.in caca.pc.in mono9.data monobold12.data
-DISTCLEANFILES = caca_types.h caca.pc
-
-AM_CPPFLAGS = -I$(top_srcdir) -DPLUGINDIR=\"$(plugindir)\"
-
-pkgconfig_DATA = caca.pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-include_HEADERS = caca.h caca_types.h caca0.h
-
-lib_LTLIBRARIES = libcaca.la
-
-libcaca_la_SOURCES = \
-	caca.c \
-	caca.h \
-	caca_types.h \
-	caca_internals.h \
-	caca_stubs.h \
-	caca0.c \
-	caca0.h \
-	canvas.c \
-	string.c \
-        legacy.c \
-        transform.c \
-        charset.c \
-        attr.c \
-        line.c \
-        box.c \
-        conic.c \
-        triangle.c \
-        frame.c \
-        dither.c \
-        font.c \
-        import.c \
-        export.c \
-        file.c \
-        figfont.c \
-	graphics.c \
-	event.c \
-	time.c \
-	driver_conio.c \
-	driver_ncurses.c \
-	driver_raw.c \
-	driver_slang.c \
-	driver_vga.c \
-	driver_win32.c \
-	$(cocoa_source) \
-	$(extra_source) \
-	$(NULL)
-libcaca_la_DEPENDENCIES = \
-	mono9.data \
-	monobold12.data \
-	$(NULL)
-libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
-libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
-libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)
-
-install-exec-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	. libcaca.la; \
-	for x in $$library_names; do \
-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-	ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
-
-uninstall-local:
-	. libcaca.la; \
-	for x in $$library_names; do \
-	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
-	rm -f $(DESTDIR)$(pkgconfigdir)/cucul.pc
-	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
-
-if USE_PLUGINS
-plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la
-plugindir = $(libdir)/caca
-
-libx11_plugin_la_SOURCES = driver_x11.c
-libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
-libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
-libx11_plugin_la_LIBADD = libcaca.la $(X11_LIBS)
-
-libgl_plugin_la_SOURCES = driver_gl.c
-libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS)
-libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
-libgl_plugin_la_LIBADD = libcaca.la $(GL_LIBS) #$(FTGL_LIBS)
-else
-extra_source = driver_x11.c driver_gl.c
-endif
-
-if USE_COCOA
-cocoa_source = driver_cocoa.m
-endif
-
+# $Id$
+
+EXTRA_DIST = caca_types.h.in caca.pc.in \
+             mono9.data monobold12.data \
+             libcaca.vcproj libcaca.def
+DISTCLEANFILES = caca_types.h caca.pc
+
+AM_CPPFLAGS = -I$(top_srcdir) -DPLUGINDIR=\"$(plugindir)\"
+
+pkgconfig_DATA = caca.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+include_HEADERS = caca.h caca_types.h caca0.h
+
+lib_LTLIBRARIES = libcaca.la
+
+libcaca_la_SOURCES = \
+	caca.c \
+	caca.h \
+	caca_types.h \
+	caca_internals.h \
+	caca_stubs.h \
+	caca0.c \
+	caca0.h \
+	canvas.c \
+	string.c \
+        legacy.c \
+        transform.c \
+        charset.c \
+        attr.c \
+        line.c \
+        box.c \
+        conic.c \
+        triangle.c \
+        frame.c \
+        dither.c \
+        font.c \
+        import.c \
+        export.c \
+        file.c \
+        figfont.c \
+	graphics.c \
+	event.c \
+	time.c \
+	driver_conio.c \
+	driver_ncurses.c \
+	driver_raw.c \
+	driver_slang.c \
+	driver_vga.c \
+	driver_win32.c \
+	$(cocoa_source) \
+	$(extra_source) \
+	$(NULL)
+libcaca_la_DEPENDENCIES = \
+	mono9.data \
+	monobold12.data \
+	$(NULL)
+libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
+libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
+libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	. libcaca.la; \
+	for x in $$library_names; do \
+	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+	ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+
+uninstall-local:
+	. libcaca.la; \
+	for x in $$library_names; do \
+	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
+	rm -f $(DESTDIR)$(pkgconfigdir)/cucul.pc
+	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
+
+if USE_PLUGINS
+plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la
+plugindir = $(libdir)/caca
+
+libx11_plugin_la_SOURCES = driver_x11.c
+libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
+libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
+libx11_plugin_la_LIBADD = libcaca.la $(X11_LIBS)
+
+libgl_plugin_la_SOURCES = driver_gl.c
+libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS)
+libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
+libgl_plugin_la_LIBADD = libcaca.la $(GL_LIBS) #$(FTGL_LIBS)
+else
+extra_source = driver_x11.c driver_gl.c
+endif
+
+if USE_COCOA
+cocoa_source = driver_cocoa.m
+endif
+

caca/libcaca.vcproj

@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libcaca"
+	ProjectGUID="{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\msvc"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca.def"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\msvc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca.def"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			>
+			<File
+				RelativePath="caca.h"
+				>
+			</File>
+			<File
+				RelativePath="caca_internals.h"
+				>
+			</File>
+			<File
+				RelativePath="caca_stubs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\msvc\caca_types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\msvc\config.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\attr.c"
+			>
+		</File>
+		<File
+			RelativePath=".\box.c"
+			>
+		</File>
+		<File
+			RelativePath=".\caca.c"
+			>
+		</File>
+		<File
+			RelativePath=".\canvas.c"
+			>
+		</File>
+		<File
+			RelativePath=".\charset.c"
+			>
+		</File>
+		<File
+			RelativePath=".\conic.c"
+			>
+		</File>
+		<File
+			RelativePath=".\dither.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_conio.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_gl.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_ncurses.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_raw.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_slang.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_vga.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_win32.c"
+			>
+		</File>
+		<File
+			RelativePath=".\driver_x11.c"
+			>
+		</File>
+		<File
+			RelativePath=".\event.c"
+			>
+		</File>
+		<File
+			RelativePath=".\export.c"
+			>
+		</File>
+		<File
+			RelativePath=".\figfont.c"
+			>
+		</File>
+		<File
+			RelativePath=".\file.c"
+			>
+		</File>
+		<File
+			RelativePath=".\font.c"
+			>
+		</File>
+		<File
+			RelativePath=".\frame.c"
+			>
+		</File>
+		<File
+			RelativePath=".\graphics.c"
+			>
+		</File>
+		<File
+			RelativePath=".\import.c"
+			>
+		</File>
+		<File
+			RelativePath=".\legacy.c"
+			>
+		</File>
+		<File
+			RelativePath=".\libcaca.def"
+			>
+		</File>
+		<File
+			RelativePath=".\line.c"
+			>
+		</File>
+		<File
+			RelativePath=".\string.c"
+			>
+		</File>
+		<File
+			RelativePath=".\time.c"
+			>
+		</File>
+		<File
+			RelativePath=".\transform.c"
+			>
+		</File>
+		<File
+			RelativePath=".\triangle.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

csharp/Makefile.am

@@ -1,35 +1,37 @@
-# $Id: $
-
-cacadir = $(libdir)/caca-sharp
-
-caca_sources = \
-	$(srcdir)/AssemblyInfo.cs \
-	$(srcdir)/Caca.cs \
-	$(srcdir)/Attr.cs \
-	$(srcdir)/Canvas.cs \
-	$(srcdir)/Display.cs \
-	$(srcdir)/Dither.cs \
-	$(srcdir)/Event.cs \
-	$(srcdir)/Font.cs
-
-test_sources = \
-	$(srcdir)/test.cs
-
-if USE_CSHARP
-caca_DATA = caca-sharp.dll caca-sharp.dll.config
-noinst_DATA = test.exe
-endif
-
-EXTRA_DIST = $(caca_sources) $(test_sources) caca-sharp.dll.config.in
-
-caca-sharp.dll: $(caca_sources)
-	gmcs -unsafe $(caca_sources) -out:$@ -target:library \
-	  -r:System.Drawing.dll
-
-test.exe: $(test_sources) caca-sharp.dll
-	gmcs $(test_sources) -out:$@ -lib:./ \
-	  -r:System.Drawing.dll -r:./caca-sharp.dll
-
-clean-local:
-	rm -f *.exe *.dll
-
+# $Id: $
+
+cacadir = $(libdir)/caca-sharp
+
+caca_sources = \
+	$(srcdir)/AssemblyInfo.cs \
+	$(srcdir)/Caca.cs \
+	$(srcdir)/Attr.cs \
+	$(srcdir)/Canvas.cs \
+	$(srcdir)/Display.cs \
+	$(srcdir)/Dither.cs \
+	$(srcdir)/Event.cs \
+	$(srcdir)/Font.cs
+
+test_sources = \
+	$(srcdir)/test.cs
+
+if USE_CSHARP
+caca_DATA = caca-sharp.dll caca-sharp.dll.config
+noinst_DATA = test.exe
+endif
+
+EXTRA_DIST = $(caca_sources) $(test_sources) \
+             caca-sharp.dll.config.in \
+             caca-sharp.csproj test-csharp.csproj
+
+caca-sharp.dll: $(caca_sources)
+	gmcs -unsafe $(caca_sources) -out:$@ -target:library \
+	  -r:System.Drawing.dll
+
+test.exe: $(test_sources) caca-sharp.dll
+	gmcs $(test_sources) -out:$@ -lib:./ \
+	  -r:System.Drawing.dll -r:./caca-sharp.dll
+
+clean-local:
+	rm -f *.exe *.dll
+

msvc/caca-sharp.csproj → csharp/caca-sharp.csproj

@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -34,14 +34,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\csharp\Caca.cs" />
-    <Compile Include="..\csharp\Canvas.cs" />
-    <Compile Include="..\csharp\Attr.cs" />
-    <Compile Include="..\csharp\Font.cs" />
-    <Compile Include="..\csharp\Dither.cs" />
-    <Compile Include="..\csharp\Display.cs" />
-    <Compile Include="..\csharp\Event.cs" />
-    <Compile Include="..\csharp\AssemblyInfo.cs" />
+    <Compile Include="Caca.cs" />
+    <Compile Include="Canvas.cs" />
+    <Compile Include="Attr.cs" />
+    <Compile Include="Font.cs" />
+    <Compile Include="Dither.cs" />
+    <Compile Include="Display.cs" />
+    <Compile Include="Event.cs" />
+    <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

msvc/test-csharp.csproj → csharp/test-csharp.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -37,7 +37,7 @@
   </Target>
   -->
   <ItemGroup>
-    <Compile Include="..\csharp\test.cs" />
+    <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="caca-sharp.csproj">

cxx/Makefile.am

@@ -1,43 +1,44 @@
-# $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
-
-if USE_CXX
-pkgconfig_DATA = caca++.pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-include_HEADERS = caca++.h
-lib_LTLIBRARIES = libcaca++.la
-endif
-
-libcaca___la_SOURCES = caca++.cpp caca++.h
-libcaca___la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
-libcaca___la_LIBADD = ../caca/libcaca.la
-
-if USE_CXX
-noinst_PROGRAMS = cxxtest
-endif
-
-cxxtest_SOURCES = cxxtest.cpp
-cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
-
-install-exec-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	. libcaca++.la; \
-	for x in $$library_names; do \
-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
-
-uninstall-local:
-	. libcaca++.la; \
-	for x in $$library_names; do \
-	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
-	rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc
-	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
-
+# $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
+
+EXTRA_DIST = libcaca++.vcproj libcaca++.def test-cxx.vcproj
+if USE_CXX
+pkgconfig_DATA = caca++.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+include_HEADERS = caca++.h
+lib_LTLIBRARIES = libcaca++.la
+endif
+
+libcaca___la_SOURCES = caca++.cpp caca++.h
+libcaca___la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
+libcaca___la_LIBADD = ../caca/libcaca.la
+
+if USE_CXX
+noinst_PROGRAMS = cxxtest
+endif
+
+cxxtest_SOURCES = cxxtest.cpp
+cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	. libcaca++.la; \
+	for x in $$library_names; do \
+	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+
+uninstall-local:
+	. libcaca++.la; \
+	for x in $$library_names; do \
+	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
+	rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
+

msvc/libcaca++.vcproj → cxx/libcaca++.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="libcaca++"
 	ProjectGUID="{5AAFB727-094F-4104-A765-A94B32497C7D}"
 	>
@@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\caca;..\cxx"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA_PP__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\msvc;..\caca;..\cxx"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA_PP__"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -170,27 +170,26 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			>
 			<File
-				RelativePath="..\cxx\caca++.cpp"
+				RelativePath="caca++.h"
 				>
 			</File>
 			<File
-				RelativePath=".\libcaca++.def"
+				RelativePath="..\msvc\config.h"
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+		<File
+			RelativePath="caca++.cpp"
 			>
-			<File
-				RelativePath="..\cxx\caca++.h"
-				>
-			</File>
-		</Filter>
+		</File>
+		<File
+			RelativePath=".\libcaca++.def"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

msvc/test-cxx.vcproj → cxx/test-cxx.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="test-cxx"
 	ProjectGUID="{F2530E59-7ADB-4D3C-8873-6D110788B8F7}"
 	RootNamespace="testcxx"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc;..\cxx;..\caca"
+				AdditionalIncludeDirectories=".;..\msvc;..\caca"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\msvc;..\cxx;..\caca"
+				AdditionalIncludeDirectories=".;..\msvc;..\caca"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -171,22 +171,10 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Fichiers sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+		<File
+			RelativePath="cxxtest.cpp"
 			>
-			<File
-				RelativePath="..\cxx\cxxtest.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Fichiers d&apos;en-tête"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

msvc/libcaca.sln → libcaca.sln

@@ -1,34 +1,36 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacafire", "cacafire.vcproj", "{F25D1237-9ED8-4343-B958-308C95FE392F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacafire", "src\cacafire.vcproj", "{F25D1237-9ED8-4343-B958-308C95FE392F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca", "libcaca.vcproj", "{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca", "caca\libcaca.vcproj", "{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacademo", "cacademo.vcproj", "{EE082122-5ECD-4DB4-93C7-145392074F8B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacademo", "src\cacademo.vcproj", "{EE082122-5ECD-4DB4-93C7-145392074F8B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "caca-sharp", "caca-sharp.csproj", "{046BD004-7B02-4521-BF01-9D9042F19AD5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "caca-sharp", "csharp\caca-sharp.csproj", "{046BD004-7B02-4521-BF01-9D9042F19AD5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "test-csharp.csproj", "{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "csharp\test-csharp.csproj", "{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca++", "libcaca++.vcproj", "{5AAFB727-094F-4104-A765-A94B32497C7D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca++", "cxx\libcaca++.vcproj", "{5AAFB727-094F-4104-A765-A94B32497C7D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-cxx", "test-cxx.vcproj", "{F2530E59-7ADB-4D3C-8873-6D110788B8F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-cxx", "cxx\test-cxx.vcproj", "{F2530E59-7ADB-4D3C-8873-6D110788B8F7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5AAFB727-094F-4104-A765-A94B32497C7D} = {5AAFB727-094F-4104-A765-A94B32497C7D}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacaview", "src\cacaview.vcproj", "{62E567BD-73B7-4C1E-9919-6423C8A8F72E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,16 +71,6 @@ Global
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.ActiveCfg = Release|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.Build.0 = Release|Win32
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C05C1521-F4E2-48D8-BD83-786EF345A887}.Release|Win32.ActiveCfg = Release|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -119,6 +111,16 @@ Global
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.ActiveCfg = Release|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.Build.0 = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.Build.0 = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Any CPU.ActiveCfg = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.ActiveCfg = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

msvc/Makefile.am

@@ -1,16 +1,8 @@
-# $Id$
-
-NULL =
-
-EXTRA_DIST = libcaca.sln \
-             config.h \
-             caca_types.h \
-             libcaca.vcproj \
-             libcaca.vcproj \
-             cacafire.vcproj \
-             cacademo.vcproj \
-             caca-sharp.csproj \
-             caca-sharp.csproj \
-             test-csharp.csproj \
-             $(NULL)
-
+# $Id$
+
+NULL =
+
+EXTRA_DIST = config.h \
+             caca_types.h \
+             $(NULL)
+

msvc/libcaca.vcproj

@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="libcaca"
-	ProjectGUID="{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\msvc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				DisableSpecificWarnings="4996;4142"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile=".\libcaca.def"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\msvc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__"
-				RuntimeLibrary="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				DisableSpecificWarnings="4996;4142"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile=".\libcaca.def"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			>
-			<File
-				RelativePath="..\caca\caca.c"
-				>
-			</File>
-                        <File
-                                RelativePath="..\caca\attr.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\box.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\string.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\charset.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\conic.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\canvas.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\dither.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\export.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\figfont.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\file.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\font.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\frame.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\import.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\line.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\transform.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\triangle.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\caca\legacy.c"
-                                >
-                        </File>
-			<File
-				RelativePath="..\caca\driver_conio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_gl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_ncurses.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_raw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_slang.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_vga.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\driver_x11.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\graphics.c"
-				>
-			</File>
-			<File
-				RelativePath=".\libcaca.def"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\time.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			>
-			<File
-				RelativePath="..\caca\caca.h"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\caca_internals.h"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\caca_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\caca\caca_stubs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\config.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

src/Makefile.am

@@ -1,47 +1,47 @@
-# $Id$
-
-pkgdata_DATA = caca.txt
-
-EXTRA_DIST = caca.txt
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
-              -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
-
-bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
-noinst_PROGRAMS = cacadraw
-
-cacademo_SOURCES = cacademo.c texture.h
-cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-cacademo_LDFLAGS = @MATH_LIBS@
-
-cacafire_SOURCES = aafire.c
-cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaview_SOURCES = cacaview.c common-image.c common-image.h
-cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-cacaview_CFLAGS = $(IMLIB2_CFLAGS)
-cacaview_LDFLAGS = $(IMLIB2_LIBS)
-
-cacadraw_SOURCES = cacadraw.c
-cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaplay_SOURCES = cacaplay.c
-cacaplay_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaserver_SOURCES = cacaserver.c
-cacaserver_LDADD = ../caca/libcaca.la
-
-img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
-img2txt_LDADD = ../caca/libcaca.la
-img2txt_CFLAGS = $(IMLIB2_CFLAGS)
-img2txt_LDFLAGS = $(IMLIB2_LIBS) $(GETOPT_LIBS)
-
-if USE_NETWORK
-fcntl_programs = cacaserver
-else
-fcntl_programs =
-endif
-
-if NEED_GETOPT_LONG
-GETOPT = mygetopt.c mygetopt.h
-endif
-
+# $Id$
+
+pkgdata_DATA = caca.txt
+
+EXTRA_DIST = caca.txt cacademo.vcproj cacafire.vcproj cacaview.vcproj
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
+              -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
+
+bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
+noinst_PROGRAMS = cacadraw
+
+cacademo_SOURCES = cacademo.c texture.h
+cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+cacademo_LDFLAGS = @MATH_LIBS@
+
+cacafire_SOURCES = aafire.c
+cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaview_SOURCES = cacaview.c common-image.c common-image.h
+cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+cacaview_LDFLAGS = $(IMLIB2_LIBS)
+
+cacadraw_SOURCES = cacadraw.c
+cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaplay_SOURCES = cacaplay.c
+cacaplay_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaserver_SOURCES = cacaserver.c
+cacaserver_LDADD = ../caca/libcaca.la
+
+img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
+img2txt_LDADD = ../caca/libcaca.la
+img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+img2txt_LDFLAGS = $(IMLIB2_LIBS) $(GETOPT_LIBS)
+
+if USE_NETWORK
+fcntl_programs = cacaserver
+else
+fcntl_programs =
+endif
+
+if NEED_GETOPT_LONG
+GETOPT = mygetopt.c mygetopt.h
+endif
+

msvc/cacademo.vcproj → src/cacademo.vcproj

@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="cacademo"
 	ProjectGUID="{EE082122-5ECD-4DB4-93C7-145392074F8B}"
+	RootNamespace="cacademo"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -124,7 +125,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -185,14 +186,17 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Name="Header Files"
 			>
 			<File
-				RelativePath="..\src\cacademo.c"
+				RelativePath="..\msvc\config.h"
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath="cacademo.c"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

msvc/cacafire.vcproj → src/cacafire.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\src;..\msvc;..\caca"
+				AdditionalIncludeDirectories="..\msvc;..\caca"
 				PreprocessorDefinitions="LIBCACA=1"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -185,14 +185,17 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Name="Header Files"
 			>
 			<File
-				RelativePath="..\src\aafire.c"
+				RelativePath="..\msvc\config.h"
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath="aafire.c"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

msvc/cacaview.vcproj → src/cacaview.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="cacaview"
 	ProjectGUID="{62E567BD-73B7-4C1E-9919-6423C8A8F72E}"
 	Keyword="Win32Proj"
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src;..\msvc;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="..\msvc;..\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="..\src;..\msvc"
+				AdditionalIncludeDirectories="..\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -178,27 +178,33 @@
 		</Configuration>
 	</Configurations>
 	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}"
+			RelativePathToProject=".\caca\libcaca.vcproj"
+		/>
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\src\cacaview.c"
+				RelativePath=".\common-image.h"
+				>
+			</File>
+			<File
+				RelativePath="..\msvc\config.h"
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
+		<File
+			RelativePath="cacaview.c"
 			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+		</File>
+		<File
+			RelativePath=".\common-image.c"
 			>
-		</Filter>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>