Changeset 4887 for zzuf


Ignore:
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:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • zzuf/trunk/.gitignore

    r4364 r4887  
    77.libs
    88.deps
     9.dirstamp
    910Makefile
    1011Makefile.in
     
    3233test/bug-memory
    3334test/bug-overflow
     35test/*.log
     36test/*.trs
    3437doc/zzat.1
    3538doc/zzuf.1
  • zzuf/trunk/configure.ac

    r4886 r4887  
    3535AC_MSG_RESULT($SONAME)
    3636AC_DEFINE_UNQUOTED(SONAME, "$SONAME", [Define to the libzzuf full name])
    37 
    38 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta18,
    39  [:],
    40  [AC_MSG_RESULT(no)
    41   AC_MSG_ERROR([you need libcaca version 0.99.beta18 or later])])
    4237
    4338# Optimizations
  • zzuf/trunk/msvc/zzat.vcxproj

    r4833 r4887  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
    88       <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     88      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8989      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9090      <MinimalRebuild>true</MinimalRebuild>
     
    9898    </ClCompile>
    9999    <Link>
    100       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     100      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    101101      <OutputFile>$(OutDir)zzat.exe</OutputFile>
    102102      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    109109    <ClCompile>
    110110      <Optimization>Disabled</Optimization>
    111       <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     111      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    112112      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    113113      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    120120    </ClCompile>
    121121    <Link>
    122       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     122      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    123123      <OutputFile>$(OutDir)zzat.exe</OutputFile>
    124124      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    129129  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    130130    <ClCompile>
    131       <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     131      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    132132      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133133      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     
    139139    </ClCompile>
    140140    <Link>
    141       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     141      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    142142      <OutputFile>$(OutDir)zzat.exe</OutputFile>
    143143      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    150150  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    151151    <ClCompile>
    152       <AdditionalIncludeDirectories>..\msvc;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     152      <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    153153      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    154154      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     
    160160    </ClCompile>
    161161    <Link>
    162       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     162      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    163163      <OutputFile>$(OutDir)zzat.exe</OutputFile>
    164164      <GenerateDebugInformation>true</GenerateDebugInformation>
  • zzuf/trunk/msvc/zzuf.vcxproj

    r4833 r4887  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
    88       <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     88      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8989      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9090      <MinimalRebuild>true</MinimalRebuild>
     
    9898    </ClCompile>
    9999    <Link>
    100       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     100      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    101101      <OutputFile>$(OutDir)zzuf.exe</OutputFile>
    102102      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    109109    <ClCompile>
    110110      <Optimization>Disabled</Optimization>
    111       <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     111      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    112112      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    113113      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    120120    </ClCompile>
    121121    <Link>
    122       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     122      <AdditionalDependencies>ws2_32.lib;AdditionalDependencies)</AdditionalDependencies>
    123123      <OutputFile>$(OutDir)zzuf.exe</OutputFile>
    124124      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    129129  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    130130    <ClCompile>
    131       <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     131      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    132132      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133133      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     
    139139    </ClCompile>
    140140    <Link>
    141       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     141      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    142142      <OutputFile>$(OutDir)zzuf.exe</OutputFile>
    143143      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    150150  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    151151    <ClCompile>
    152       <AdditionalIncludeDirectories>..\msvc;..\src\common;..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     152      <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    153153      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    154154      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     
    160160    </ClCompile>
    161161    <Link>
    162       <AdditionalDependencies>ws2_32.lib;..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>
     162      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    163163      <OutputFile>$(OutDir)zzuf.exe</OutputFile>
    164164      <GenerateDebugInformation>true</GenerateDebugInformation>
  • zzuf/trunk/src/Makefile.am

    r4683 r4887  
    44
    55ZZUF = \
    6     zzuf.c opts.c opts.h md5.c md5.h timer.c timer.h myfork.c myfork.h
     6    zzuf.c opts.c opts.h md5.c md5.h timer.c timer.h myfork.c myfork.h \
     7    caca_getopt.c caca_getopt.h
    78
    89ZZAT = \
    9     zzat.c
     10    zzat.c \
     11    caca_getopt.c caca_getopt.h
    1012
    1113LIBZZUF = \
     
    2628zzuf_SOURCES = $(ZZUF) $(COMMON)
    2729zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\" -I$(srcdir)/common
    28 zzuf_LDFLAGS = $(CACA_LIBS) $(MATH_LIBS) $(WINSOCK2_LIBS)
     30zzuf_LDFLAGS = $(MATH_LIBS) $(WINSOCK2_LIBS)
    2931zzuf_DEPENDENCIES = libzzuf.la
    3032
    3133zzat_SOURCES = $(ZZAT)
    32 zzat_LDFLAGS = $(CACA_LIBS)
     34zzat_LDFLAGS =
    3335
    3436libzzuf_la_SOURCES = $(LIBZZUF) $(COMMON)
  • zzuf/trunk/src/zzuf.c

    r4835 r4887  
    5555#endif
    5656
    57 #include <caca.h>
    58 
    5957#include "common.h"
    6058#include "opts.h"
     
    6563#include "md5.h"
    6664#include "timer.h"
     65#include "caca_getopt.h"
    6766
    6867#if !defined SIGKILL
Note: See TracChangeset for help on using the changeset viewer.