Changeset 4887 for zzufTweet

Timestamp:

Nov 5, 2014, 1:23:22 AM (5 years ago)

Author:

Sam Hocevar

Message:

build: remove the libcaca dependency and embed code instead.

Location:

zzuf/trunk

Files:

• .gitignore (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• msvc/zzat.vcxproj (modified) (8 diffs)
• msvc/zzuf.vcxproj (modified) (8 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/caca_getopt.c (added)
• src/caca_getopt.h (added)
• src/zzuf.c (modified) (2 diffs)

zzuf/trunk/.gitignore

@@ -7 +7 @@
 .libs
 .deps
+.dirstamp
 Makefile
 Makefile.in
@@ -32 +33 @@
 test/bug-memory
 test/bug-overflow
+test/*.log
+test/*.trs
 doc/zzat.1
 doc/zzuf.1

zzuf/trunk/configure.ac

@@ -35 +35 @@
 AC_MSG_RESULT($SONAME)
 AC_DEFINE_UNQUOTED(SONAME, "$SONAME", [Define to the libzzuf full name])
-
-PKG_CHECK_MODULES(CACA, caca >= 0.99.beta18,
- [:],
- [AC_MSG_RESULT(no)
-  AC_MSG_ERROR([you need libcaca version 0.99.beta18 or later])])
 
 # Optimizations

zzuf/trunk/msvc/zzat.vcxproj

@@ -86 +86 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
@@ -98 +98 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzat.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109 +109 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -120 +120 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzat.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129 +129 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -139 +139 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzat.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -150 +150 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -160 +160 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzat.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>

zzuf/trunk/msvc/zzuf.vcxproj

@@ -86 +86 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
@@ -98 +98 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzuf.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109 +109 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -120 +120 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzuf.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129 +129 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -139 +139 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzuf.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -150 +150 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -160 +160 @@
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zzuf.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>

zzuf/trunk/src/Makefile.am

@@ -4 +4 @@
 
 ZZUF = \
-    zzuf.c opts.c opts.h md5.c md5.h timer.c timer.h myfork.c myfork.h
+    zzuf.c opts.c opts.h md5.c md5.h timer.c timer.h myfork.c myfork.h \
+    caca_getopt.c caca_getopt.h
 
 ZZAT = \
-    zzat.c
+    zzat.c \
+    caca_getopt.c caca_getopt.h
 
 LIBZZUF = \
@@ -26 +28 @@
 zzuf_SOURCES = $(ZZUF) $(COMMON)
 zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\" -I$(srcdir)/common
-zzuf_LDFLAGS = $(CACA_LIBS) $(MATH_LIBS) $(WINSOCK2_LIBS)
+zzuf_LDFLAGS = $(MATH_LIBS) $(WINSOCK2_LIBS)
 zzuf_DEPENDENCIES = libzzuf.la
 
 zzat_SOURCES = $(ZZAT)
-zzat_LDFLAGS = $(CACA_LIBS)
+zzat_LDFLAGS =
 
 libzzuf_la_SOURCES = $(LIBZZUF) $(COMMON)

zzuf/trunk/src/zzuf.c

@@ -55 +55 @@
 #endif
 
-#include <caca.h>
-
 #include "common.h"
 #include "opts.h"
@@ -65 +63 @@
 #include "md5.h"
 #include "timer.h"
+#include "caca_getopt.h"
 
 #if !defined SIGKILL