diff --git a/.gitignore b/.gitignore index c0bf1bc9..4c5d6a35 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /obj /bin/grafx2* /bin/generatedoc* +/bin/*.dll /src/version.c /src/*.tgz @@ -20,6 +21,7 @@ /doc/html /doc/doxygen +/doc/README-*.txt *.tgz *.zip diff --git a/3rdparty/Makefile b/3rdparty/Makefile index 8ca874a3..b974c8c4 100644 --- a/3rdparty/Makefile +++ b/3rdparty/Makefile @@ -99,7 +99,7 @@ $(PREFIX)/lib/liblua.a: $(LUA)/.ok ifdef WIN32 cd $(LUA) && $(MAKE) PLAT=mingw CC=$(CC) RANLIB=$(RANLIB) cd $(LUA) && $(MAKE) install PLAT=mingw INSTALL_TOP=$(PREFIX) TO_BIN="lua.exe luac.exe" - cp -v $(LUA)/src/lua*.dll ../bin + $(MKDIR) ../bin && $(CP) $(LUA)/src/lua*.dll ../bin echo "The Windows distribution of Grafx2 is linked with Lua v$(LUAVER)" > ../doc/README-lua.txt grep LUA_COPYRIGHT $(LUA)/src/lua.h | cut -d'"' -f 2 >> ../doc/README-lua.txt @@ -116,9 +116,10 @@ $(LUA)/.ok: archives/$(LUAARCH) $(PREFIX)/lib/libSDLmain.a: archives/$(SDLDEVEL) $(TAR) xzf $< patch -p0 < $(SDLDEVELPATCH) + $(MKDIR) $(PREFIX) cd SDL-1.2.15 && CROSS_PATH=$(PREFIX) $(MAKE) cross ifdef WIN32 - $(CP) $(PREFIX)/bin/SDL.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/SDL.dll ../bin echo "The following file:" > ../doc/README-SDL.txt echo "" >> ../doc/README-SDL.txt echo " SDL.dll" >> ../doc/README-SDL.txt @@ -136,7 +137,7 @@ $(PREFIX)/lib/libSDL_image.a: $(SDLIMAGE)/.ok cd $(SDLIMAGE) && $(MAKE) cd $(SDLIMAGE) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/SDL_image.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/SDL_image.dll ../bin echo "$(SDLIMAGE)" > ../doc/README-SDL_image.txt echo "" >> ../doc/README-SDL_image.txt echo "dependencies :" >> ../doc/README-SDL_image.txt @@ -161,7 +162,7 @@ $(PREFIX)/lib/libSDL_ttf.a: $(SDLTTF)/.ok cd $(SDLTTF) && $(MAKE) cd $(SDLTTF) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/SDL_ttf.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/SDL_ttf.dll ../bin echo "$(SDLTTF)" > ../doc/README-SDL_ttf.txt echo "" >> ../doc/README-SDL_ttf.txt echo "dependencies :" >> ../doc/README-SDL_ttf.txt @@ -184,7 +185,7 @@ $(PREFIX)/lib/libfreetype.a: $(FREETYPE)/.ok cd $(FREETYPE) && $(MAKE) cd $(FREETYPE) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/libfreetype*.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/libfreetype*.dll ../bin echo "$(FREETYPE)" > ../doc/README-freetype.txt echo "" >> ../doc/README-freetype.txt echo "License :" >> ../doc/README-freetype.txt @@ -201,7 +202,7 @@ $(PREFIX)/lib/libjpeg.a: $(JPEGDIR)/.ok cd $(JPEGDIR) && $(MAKE) cd $(JPEGDIR) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/libjpeg*.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/libjpeg*.dll ../bin $(CP) $(JPEGDIR)/README ../doc/README-jpeg.txt endif @@ -219,7 +220,7 @@ $(PREFIX)/lib/libtiff.a: $(LIBTIFF)/.ok cd $(LIBTIFF) && $(MAKE) cd $(LIBTIFF) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/libtiff*.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/libtiff*.dll ../bin echo "$(LIBTIFF)" > ../doc/README-tiff.txt echo "" >> ../doc/README-tiff.txt echo "License :" >> ../doc/README-tiff.txt @@ -238,7 +239,7 @@ $(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok cd $(LIBPNG) && $(MAKE) cd $(LIBPNG) && $(MAKE) install ifdef WIN32 - $(CP) $(PREFIX)/bin/libpng*.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/libpng*.dll ../bin echo "$(LIBPNG)" > ../doc/README-libpng.txt echo "" >> ../doc/README-libpng.txt echo "License :" >> ../doc/README-libpng.txt @@ -254,7 +255,7 @@ $(PREFIX)/lib/libz.a: $(ZLIB)/.ok cd $(ZLIB) && $(MAKE) -fwin32/Makefile.gcc PREFIX=$(shell echo $(CC) | sed 's/^\(.*\)gcc/\1/') LOC="$(LDFLAGS) $(CFLAGS)" cd $(ZLIB) && INCLUDE_PATH=$(PREFIX)/include LIBRARY_PATH=$(PREFIX)/lib BINARY_PATH=$(PREFIX)/bin $(MAKE) install -fwin32/Makefile.gcc SHARED_MODE=1 ifdef WIN32 - $(CP) $(PREFIX)/bin/zlib*.dll ../bin + $(MKDIR) ../bin && $(CP) $(PREFIX)/bin/zlib*.dll ../bin $(CP) $(ZLIB)/README ../doc/README-zlib1.txt endif diff --git a/bin/SDL.dll b/bin/SDL.dll deleted file mode 100644 index 01b220d3..00000000 Binary files a/bin/SDL.dll and /dev/null differ diff --git a/bin/SDL_image.dll b/bin/SDL_image.dll deleted file mode 100644 index f6fde646..00000000 Binary files a/bin/SDL_image.dll and /dev/null differ diff --git a/bin/SDL_ttf.dll b/bin/SDL_ttf.dll deleted file mode 100644 index d860530c..00000000 Binary files a/bin/SDL_ttf.dll and /dev/null differ diff --git a/bin/libfreetype-6.dll b/bin/libfreetype-6.dll deleted file mode 100644 index fed8bca1..00000000 Binary files a/bin/libfreetype-6.dll and /dev/null differ diff --git a/bin/libpng14-14.dll b/bin/libpng14-14.dll deleted file mode 100644 index fdad385e..00000000 Binary files a/bin/libpng14-14.dll and /dev/null differ diff --git a/bin/zlib1.dll b/bin/zlib1.dll deleted file mode 100644 index 1cf8a476..00000000 Binary files a/bin/zlib1.dll and /dev/null differ diff --git a/doc/README-SDL.txt b/doc/README-SDL.txt deleted file mode 100644 index 88914419..00000000 --- a/doc/README-SDL.txt +++ /dev/null @@ -1,16 +0,0 @@ -The following file: - - SDL.dll - -is the runtime environment for the SDL library. - -The Simple DirectMedia Layer (SDL for short) is a cross-platfrom library -designed to make it easy to write multi-media software, such as games and -emulators. - -The Simple DirectMedia Layer library source code is available from: -http://www.libsdl.org/ - -This library is distributed under the terms of the GNU LGPL license: -http://www.gnu.org/copyleft/lesser.html - diff --git a/doc/README-SDL_image.txt b/doc/README-SDL_image.txt deleted file mode 100644 index 3b57d56b..00000000 --- a/doc/README-SDL_image.txt +++ /dev/null @@ -1,19 +0,0 @@ -The following file - - SDL_image.dll - -is the runtime environment for the library SDL_image 1.2.10 by Sam Lantiga and Mattias Engdegård. - -This library is distributed under the terms of the GNU LGPL license: -http://www.gnu.org/copyleft/lesser.html - -The source is available from the libraries page at the SDL website: -http://www.libsdl.org/ - -========================= - -Compiled by yrizoud on 16/06/2010 with static builds of : - libjpeg (JPEG library http://www.ijg.org/ release 6b of 27-Mar-1998 : jpegsr6.zip) - libtiff (TIFF library ftp://ftp.sgi.com/graphics/tiff/ : tiff-v3.4-tar.gz) -And dynamic version of : - libpng (http://www.libpng.org/pub/png/libpng.html) v1.4.2 --> libpng14-14.dll requirement diff --git a/doc/README-SDL_ttf.txt b/doc/README-SDL_ttf.txt deleted file mode 100644 index 176bb6f6..00000000 --- a/doc/README-SDL_ttf.txt +++ /dev/null @@ -1,12 +0,0 @@ -The following files: - - SDL_ttf.dll - libfreetype-6.dll - -are the runtime environment for the library SDL_ttf 2.0 by Sam Lantiga. - -This library is distributed under the terms of the GNU LGPL license: -http://www.gnu.org/copyleft/lesser.html - -The source is available from the libraries page at the SDL website: -http://www.libsdl.org/ diff --git a/doc/README-lua.txt b/doc/README-lua.txt deleted file mode 100644 index 43eee2a9..00000000 --- a/doc/README-lua.txt +++ /dev/null @@ -1,24 +0,0 @@ -The Windows distribution of Grafx2 is compiled and statically linked with -Lua v5.1.4 - -Lua is licensed with the MIT license: - -Copyright © 1994-2008 Lua.org, PUC-Rio. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/doc/README-zlib1.txt b/doc/README-zlib1.txt deleted file mode 100644 index 02f90d30..00000000 --- a/doc/README-zlib1.txt +++ /dev/null @@ -1,53 +0,0 @@ - -What's here -=========== - The official ZLIB1.DLL - - -Source -====== - zlib version 1.2.3 - available at http://www.gzip.org/zlib/ - - -Specification and rationale -=========================== - See the accompanying DLL_FAQ.txt - - -Usage -===== - See the accompanying USAGE.txt - - -Build info -========== - Contributed by Gilles Vollant - - Compiler: Microsoft Visual C++ Toolkit 2003 - Library: Microsoft Visual C++ 6.0 (to link with MSVCRT.DLL) - - -Copyright notice -================ - (C) 1995-2005 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu -