From 9a3711a3681a00448dc0b88811490c8b8f232238 Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Wed, 6 Feb 2019 04:07:03 +0200 Subject: [PATCH] preparing for release 0.5 --- Makefile.in | 2 +- README.md | 11 +- configure | 2 +- examples/nofreetype/nofreetype.vcxproj | 103 ---------------- .../nofreetype/nofreetype.vcxproj.filters | 14 --- install.bat | 5 - libdrawtext-noft.vcxproj | 111 ------------------ libdrawtext-noft.vcxproj.filters | 38 ------ libdrawtext.sln | 42 ------- libdrawtext.vcxproj | 111 ------------------ libdrawtext.vcxproj.filters | 38 ------ src/drawtext.h | 2 +- 12 files changed, 9 insertions(+), 470 deletions(-) delete mode 100644 examples/nofreetype/nofreetype.vcxproj delete mode 100644 examples/nofreetype/nofreetype.vcxproj.filters delete mode 100644 install.bat delete mode 100644 libdrawtext-noft.vcxproj delete mode 100644 libdrawtext-noft.vcxproj.filters delete mode 100644 libdrawtext.sln delete mode 100644 libdrawtext.vcxproj delete mode 100644 libdrawtext.vcxproj.filters diff --git a/Makefile.in b/Makefile.in index 29b6481..ec44ac5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ obj = $(src:.c=.o) dep = $(obj:.o=.d) abi = 0 -rev = 4 +rev = 5 lib_a = $(name).a sodir = lib diff --git a/README.md b/README.md index a62a6c2..b4ac23a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Dependencies License ------- -Copyright (C) 2011-2016 John Tsiombikas +Copyright (C) 2011-2019 John Tsiombikas You may freely use, modify and/or redistribute libdrawtext, under the terms of the GNU Lesser General Public License (LGPL) version 3 (or at your option, any later version published by the Free Software Foundation). See COPYING, and @@ -33,7 +33,7 @@ COPYING.LESSER for details. Build ----- -To build and install `libdrawtext` on UNIX, run the usual: +To build and install `libdrawtext` on UNIX or on Windows with MinGW, run: ./configure make @@ -41,15 +41,16 @@ To build and install `libdrawtext` on UNIX, run the usual: See `./configure --help` for build-time options. -To build on windows, you may use the included visual studio project, or use -mingw, in which case just follow the UNIX instructions above. - To cross-compile for windows with mingw-w64, try the following incantation: ./configure --prefix=/usr/i686-w64-mingw32 make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar sys=mingw make install sys=mingw +Previous versions of this library included a visual studio project file. As I'm +not able to maintain it, I decided to remove it completely from this release. +The only way it can return in future releases, is if someone steps up to +maintain it. Send me an e-mail if you're interested. Contact ------- diff --git a/configure b/configure index b0698f4..cb9e05c 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #!/bin/sh prefix=/usr/local -opt=false +opt=true dbg=true use_ft2=true name=libdrawtext diff --git a/examples/nofreetype/nofreetype.vcxproj b/examples/nofreetype/nofreetype.vcxproj deleted file mode 100644 index 6bcdb90..0000000 --- a/examples/nofreetype/nofreetype.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D52142DD-6188-4825-9242-5927A3568D03} - nofreetype - Win32Proj - - - - Application - v120 - MultiByte - false - - - Application - v120 - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - - Disabled - WIN32;FREEGLUT_LIB_PRAGMAS=0;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - EditAndContinue - 4305;%(DisableSpecificWarnings) - $(SolutionDir)\src;%(AdditionalIncludeDirectories) - - - libdrawtext-noft.lib;glew32.lib;opengl32.lib;glu32.lib;freeglut.lib;%(AdditionalDependencies) - $(SolutionDir)\$(Configuration)-noft;%(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - - - MaxSpeed - true - WIN32;FREEGLUT_LIB_PRAGMAS=0;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - true - - Level3 - ProgramDatabase - 4305;%(DisableSpecificWarnings) - $(SolutionDir)\src;%(AdditionalIncludeDirectories) - - - libdrawtext-noft.lib;glew32.lib;opengl32.lib;glu32.lib;freeglut.lib;%(AdditionalDependencies) - $(SolutionDir)\$(Configuration)-noft;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX86 - - - - - - - - - diff --git a/examples/nofreetype/nofreetype.vcxproj.filters b/examples/nofreetype/nofreetype.vcxproj.filters deleted file mode 100644 index 875a75f..0000000 --- a/examples/nofreetype/nofreetype.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - src - - - \ No newline at end of file diff --git a/install.bat b/install.bat deleted file mode 100644 index 5bb1ad2..0000000 --- a/install.bat +++ /dev/null @@ -1,5 +0,0 @@ -mkdir c:\usr\include\ -copy /Y usr\include\* c:\usr\include\ -mkdir c:\usr\lib -copy /Y usr\lib\* c:\usr\lib\ -pause diff --git a/libdrawtext-noft.vcxproj b/libdrawtext-noft.vcxproj deleted file mode 100644 index 34d953b..0000000 --- a/libdrawtext-noft.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7} - libdrawtext-noft - Win32Proj - - - - StaticLibrary - v120 - MultiByte - false - - - StaticLibrary - v120 - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)-noft\ - $(Configuration)-noft\ - - - $(SolutionDir)$(Configuration)-noft\ - $(Configuration)-noft\ - - - - Disabled - WIN32;_DEBUG;_LIB;NO_FREETYPE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - EditAndContinue - 4996;4244;%(DisableSpecificWarnings) - - - opengl32.lib;%(AdditionalDependencies) - - - mkdir usr\include -mkdir usr\lib -copy /Y src\drawtext.h usr\include\drawtext.h -copy /Y $(TargetPath) usr\lib\$(TargetName)-dbg.lib - - - - - - MaxSpeed - true - WIN32;NDEBUG;_LIB;NO_FREETYPE;%(PreprocessorDefinitions) - MultiThreaded - true - - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - opengl32.lib;%(AdditionalDependencies) - - - mkdir usr\include -mkdir usr\lib -copy /Y src\drawtext.h usr\include\drawtext.h -copy /Y $(TargetPath) usr\lib - - - - - - - - - - - - - - - - - - diff --git a/libdrawtext-noft.vcxproj.filters b/libdrawtext-noft.vcxproj.filters deleted file mode 100644 index 372a04c..0000000 --- a/libdrawtext-noft.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/libdrawtext.sln b/libdrawtext.sln deleted file mode 100644 index 7f0202a..0000000 --- a/libdrawtext.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9EDBC830-5169-4460-92C0-DFFE45FC24D4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdrawtext", "libdrawtext.vcxproj", "{F6241CAB-984D-457D-A7EA-E66A57889490}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nofreetype", "examples\nofreetype\nofreetype.vcxproj", "{D52142DD-6188-4825-9242-5927A3568D03}" - ProjectSection(ProjectDependencies) = postProject - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7} = {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdrawtext-noft", "libdrawtext-noft.vcxproj", "{D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F6241CAB-984D-457D-A7EA-E66A57889490}.Debug|Win32.ActiveCfg = Debug|Win32 - {F6241CAB-984D-457D-A7EA-E66A57889490}.Debug|Win32.Build.0 = Debug|Win32 - {F6241CAB-984D-457D-A7EA-E66A57889490}.Release|Win32.ActiveCfg = Release|Win32 - {F6241CAB-984D-457D-A7EA-E66A57889490}.Release|Win32.Build.0 = Release|Win32 - {D52142DD-6188-4825-9242-5927A3568D03}.Debug|Win32.ActiveCfg = Debug|Win32 - {D52142DD-6188-4825-9242-5927A3568D03}.Debug|Win32.Build.0 = Debug|Win32 - {D52142DD-6188-4825-9242-5927A3568D03}.Release|Win32.ActiveCfg = Release|Win32 - {D52142DD-6188-4825-9242-5927A3568D03}.Release|Win32.Build.0 = Release|Win32 - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Debug|Win32.Build.0 = Debug|Win32 - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Release|Win32.ActiveCfg = Release|Win32 - {D28DE6C7-EF8F-4D37-997D-12AAE6E48FD7}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {D52142DD-6188-4825-9242-5927A3568D03} = {9EDBC830-5169-4460-92C0-DFFE45FC24D4} - EndGlobalSection -EndGlobal diff --git a/libdrawtext.vcxproj b/libdrawtext.vcxproj deleted file mode 100644 index ec06c0e..0000000 --- a/libdrawtext.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {F6241CAB-984D-457D-A7EA-E66A57889490} - libdrawtext - Win32Proj - - - - StaticLibrary - v120 - MultiByte - false - - - StaticLibrary - v120 - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - EditAndContinue - 4996;4244;%(DisableSpecificWarnings) - - - freetype.lib;opengl32.lib;%(AdditionalDependencies) - - - mkdir usr\include -mkdir usr\lib -copy /Y src\drawtext.h usr\include\drawtext.h -copy /Y $(TargetPath) usr\lib\$(TargetName)-dbg.lib - - - - - - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - true - - Level3 - ProgramDatabase - 4996;4244;%(DisableSpecificWarnings) - - - freetype.lib;opengl32.lib;%(AdditionalDependencies) - - - mkdir usr\include -mkdir usr\lib -copy /Y src\drawtext.h usr\include\drawtext.h -copy /Y $(TargetPath) usr\lib - - - - - - - - - - - - - - - - - - diff --git a/libdrawtext.vcxproj.filters b/libdrawtext.vcxproj.filters deleted file mode 100644 index 372a04c..0000000 --- a/libdrawtext.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/src/drawtext.h b/src/drawtext.h index 676618c..d2d1913 100644 --- a/src/drawtext.h +++ b/src/drawtext.h @@ -1,6 +1,6 @@ /* libdrawtext - a simple library for fast text rendering in OpenGL -Copyright (C) 2011-2018 John Tsiombikas +Copyright (C) 2011-2019 John Tsiombikas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by