- Timestamp:
- Nov 5, 2014, 1:23:22 AM (5 years ago)
- Location:
- zzuf/trunk
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
zzuf/trunk/.gitignore
r4364 r4887 7 7 .libs 8 8 .deps 9 .dirstamp 9 10 Makefile 10 11 Makefile.in … … 32 33 test/bug-memory 33 34 test/bug-overflow 35 test/*.log 36 test/*.trs 34 37 doc/zzat.1 35 38 doc/zzuf.1 -
zzuf/trunk/configure.ac
r4886 r4887 35 35 AC_MSG_RESULT($SONAME) 36 36 AC_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])])42 37 43 38 # Optimizations -
zzuf/trunk/msvc/zzat.vcxproj
r4833 r4887 86 86 <ClCompile> 87 87 <Optimization>Disabled</Optimization> 88 <AdditionalIncludeDirectories>..\msvc; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>88 <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 89 89 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 90 90 <MinimalRebuild>true</MinimalRebuild> … … 98 98 </ClCompile> 99 99 <Link> 100 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>100 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 101 101 <OutputFile>$(OutDir)zzat.exe</OutputFile> 102 102 <GenerateDebugInformation>true</GenerateDebugInformation> … … 109 109 <ClCompile> 110 110 <Optimization>Disabled</Optimization> 111 <AdditionalIncludeDirectories>..\msvc; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>111 <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 112 112 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 113 113 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> … … 120 120 </ClCompile> 121 121 <Link> 122 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>122 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 123 123 <OutputFile>$(OutDir)zzat.exe</OutputFile> 124 124 <GenerateDebugInformation>true</GenerateDebugInformation> … … 129 129 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 130 130 <ClCompile> 131 <AdditionalIncludeDirectories>..\msvc; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>131 <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 132 132 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 133 133 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> … … 139 139 </ClCompile> 140 140 <Link> 141 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>141 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 142 142 <OutputFile>$(OutDir)zzat.exe</OutputFile> 143 143 <GenerateDebugInformation>true</GenerateDebugInformation> … … 150 150 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 151 151 <ClCompile> 152 <AdditionalIncludeDirectories>..\msvc; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>152 <AdditionalIncludeDirectories>..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 153 153 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 154 154 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> … … 160 160 </ClCompile> 161 161 <Link> 162 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>162 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 163 163 <OutputFile>$(OutDir)zzat.exe</OutputFile> 164 164 <GenerateDebugInformation>true</GenerateDebugInformation> -
zzuf/trunk/msvc/zzuf.vcxproj
r4833 r4887 86 86 <ClCompile> 87 87 <Optimization>Disabled</Optimization> 88 <AdditionalIncludeDirectories>..\msvc;..\src\common; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>88 <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 89 89 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 90 90 <MinimalRebuild>true</MinimalRebuild> … … 98 98 </ClCompile> 99 99 <Link> 100 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Debug\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>100 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 101 101 <OutputFile>$(OutDir)zzuf.exe</OutputFile> 102 102 <GenerateDebugInformation>true</GenerateDebugInformation> … … 109 109 <ClCompile> 110 110 <Optimization>Disabled</Optimization> 111 <AdditionalIncludeDirectories>..\msvc;..\src\common; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>111 <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 112 112 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 113 113 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> … … 120 120 </ClCompile> 121 121 <Link> 122 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Debug\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>122 <AdditionalDependencies>ws2_32.lib;AdditionalDependencies)</AdditionalDependencies> 123 123 <OutputFile>$(OutDir)zzuf.exe</OutputFile> 124 124 <GenerateDebugInformation>true</GenerateDebugInformation> … … 129 129 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 130 130 <ClCompile> 131 <AdditionalIncludeDirectories>..\msvc;..\src\common; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>131 <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 132 132 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 133 133 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> … … 139 139 </ClCompile> 140 140 <Link> 141 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Release\Win32\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>141 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 142 142 <OutputFile>$(OutDir)zzuf.exe</OutputFile> 143 143 <GenerateDebugInformation>true</GenerateDebugInformation> … … 150 150 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 151 151 <ClCompile> 152 <AdditionalIncludeDirectories>..\msvc;..\src\common; ..\..\libcaca\caca;..\..\libcaca\caca\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>152 <AdditionalIncludeDirectories>..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 153 153 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> 154 154 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> … … 160 160 </ClCompile> 161 161 <Link> 162 <AdditionalDependencies>ws2_32.lib; ..\..\libcaca\win32\Release\x64\libcaca.lib;%(AdditionalDependencies)</AdditionalDependencies>162 <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 163 163 <OutputFile>$(OutDir)zzuf.exe</OutputFile> 164 164 <GenerateDebugInformation>true</GenerateDebugInformation> -
zzuf/trunk/src/Makefile.am
r4683 r4887 4 4 5 5 ZZUF = \ 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 7 8 8 9 ZZAT = \ 9 zzat.c 10 zzat.c \ 11 caca_getopt.c caca_getopt.h 10 12 11 13 LIBZZUF = \ … … 26 28 zzuf_SOURCES = $(ZZUF) $(COMMON) 27 29 zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\" -I$(srcdir)/common 28 zzuf_LDFLAGS = $( CACA_LIBS) $(MATH_LIBS) $(WINSOCK2_LIBS)30 zzuf_LDFLAGS = $(MATH_LIBS) $(WINSOCK2_LIBS) 29 31 zzuf_DEPENDENCIES = libzzuf.la 30 32 31 33 zzat_SOURCES = $(ZZAT) 32 zzat_LDFLAGS = $(CACA_LIBS)34 zzat_LDFLAGS = 33 35 34 36 libzzuf_la_SOURCES = $(LIBZZUF) $(COMMON) -
zzuf/trunk/src/zzuf.c
r4835 r4887 55 55 #endif 56 56 57 #include <caca.h>58 59 57 #include "common.h" 60 58 #include "opts.h" … … 65 63 #include "md5.h" 66 64 #include "timer.h" 65 #include "caca_getopt.h" 67 66 68 67 #if !defined SIGKILL
Note: See TracChangeset
for help on using the changeset viewer.