diff --git a/caca/Makefile.am b/caca/Makefile.am index d10c3ab..e2b3731 100644 --- a/caca/Makefile.am +++ b/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 + diff --git a/msvc/libcaca.def b/caca/libcaca.def similarity index 100% rename from msvc/libcaca.def rename to caca/libcaca.def diff --git a/caca/libcaca.vcproj b/caca/libcaca.vcproj new file mode 100644 index 0000000..ad2b210 --- /dev/null +++ b/caca/libcaca.vcproj @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/csharp/Makefile.am b/csharp/Makefile.am index 4a60b7d..babf863 100644 --- a/csharp/Makefile.am +++ b/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 + diff --git a/msvc/caca-sharp.csproj b/csharp/caca-sharp.csproj similarity index 77% rename from msvc/caca-sharp.csproj rename to csharp/caca-sharp.csproj index e293536..42b9042 100755 --- a/msvc/caca-sharp.csproj +++ b/csharp/caca-sharp.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -34,14 +34,14 @@ - - - - - - - - + + + + + + + + - + diff --git a/cxx/Makefile.am b/cxx/Makefile.am index a660754..70060c2 100644 --- a/cxx/Makefile.am +++ b/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 + diff --git a/msvc/libcaca++.def b/cxx/libcaca++.def similarity index 100% rename from msvc/libcaca++.def rename to cxx/libcaca++.def diff --git a/msvc/libcaca++.vcproj b/cxx/libcaca++.vcproj similarity index 85% rename from msvc/libcaca++.vcproj rename to cxx/libcaca++.vcproj index a4d34bc..087b515 100644 --- a/msvc/libcaca++.vcproj +++ b/cxx/libcaca++.vcproj @@ -1,7 +1,7 @@ @@ -38,7 +38,7 @@ - - - - + + + diff --git a/msvc/test-cxx.vcproj b/cxx/test-cxx.vcproj similarity index 81% rename from msvc/test-cxx.vcproj rename to cxx/test-cxx.vcproj index 9d90d11..f0e132e 100755 --- a/msvc/test-cxx.vcproj +++ b/cxx/test-cxx.vcproj @@ -1,7 +1,7 @@ - - - - - - + diff --git a/msvc/libcaca.sln b/libcaca.sln similarity index 83% rename from msvc/libcaca.sln rename to libcaca.sln index 8137989..0803d26 100644 --- a/msvc/libcaca.sln +++ b/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 diff --git a/msvc/Makefile.am b/msvc/Makefile.am index f20e338..a384179 100644 --- a/msvc/Makefile.am +++ b/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) + diff --git a/msvc/libcaca.vcproj b/msvc/libcaca.vcproj deleted file mode 100644 index 224437d..0000000 --- a/msvc/libcaca.vcproj +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Makefile.am b/src/Makefile.am index 055ef44..ba82516 100644 --- a/src/Makefile.am +++ b/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 + diff --git a/msvc/cacademo.vcproj b/src/cacademo.vcproj similarity index 89% rename from msvc/cacademo.vcproj rename to src/cacademo.vcproj index 4884030..2b9020d 100644 --- a/msvc/cacademo.vcproj +++ b/src/cacademo.vcproj @@ -4,6 +4,7 @@ Version="8.00" Name="cacademo" ProjectGUID="{EE082122-5ECD-4DB4-93C7-145392074F8B}" + RootNamespace="cacademo" Keyword="Win32Proj" > @@ -40,7 +41,7 @@ + + diff --git a/msvc/cacafire.vcproj b/src/cacafire.vcproj similarity index 89% rename from msvc/cacafire.vcproj rename to src/cacafire.vcproj index 52c240b..42c2734 100644 --- a/msvc/cacafire.vcproj +++ b/src/cacafire.vcproj @@ -40,7 +40,7 @@ + + diff --git a/msvc/cacaview.vcproj b/src/cacaview.vcproj similarity index 83% rename from msvc/cacaview.vcproj rename to src/cacaview.vcproj index 2e910c5..1ef85b2 100644 --- a/msvc/cacaview.vcproj +++ b/src/cacaview.vcproj @@ -1,7 +1,7 @@ + + + - - - + - +