Author: fireball Date: Tue Nov 13 13:03:19 2007 New Revision: 30414
URL: http://svn.reactos.org/svn/reactos?rev=30414&view=rev Log: - Fix dxtn path once again (thanks Pigglesworth). - Remove unneeded files from dxtn's source code.
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw trunk/reactos/dll/3rdparty/dxtn/Makefile.vc trunk/reactos/dll/3rdparty/dxtn/Makefile.wat trunk/reactos/dll/3rdparty/dxtn/docs/ trunk/reactos/dll/3rdparty/dxtn/test/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Nov 13 13:03:19 2007 @@ -101,7 +101,7 @@ ; Dynamic Link Libraries dll\3rdparty\freetype\freetype.dll 1 dll\3rdparty\mesa32\mesa32.dll 1 -dll\3rdparty\dxtn.dll 1 optional +dll\3rdparty\dxtn\dxtn.dll 1 optional
dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile?... ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/Makefile (original) +++ trunk/reactos/dll/3rdparty/dxtn/Makefile (removed) @@ -1,69 +1,0 @@ -# Texture compression Linux makefile -# Version: 1.1 -# -# Copyright (C) 2004 Daniel Borca All Rights Reserved. -# -# this is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# this is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - -# -# Available options: -# -# Environment variables: -# -# Targets: -# all: build dynamic module -# clean: remove object files -# realclean: remove all generated files -# - - -.PHONY: all clean realclean - -DLLNAME = libdxtn.so - -CC = gcc -CFLAGS = -Wall -W -pedantic -ansi -CFLAGS += -O2 -ffast-math -funroll-loops -#CFLAGS += -fomit-frame-pointer -fexpensive-optimizations -CFLAGS += -fPIC -DPIC - -LD = gcc -LDFLAGS = -shared -LDLIBS = - -SOURCES = \ - fxt1.c \ - dxtn.c \ - wrapper.c \ - texstore.c - -OBJECTS = $(SOURCES:.c=.o) - -.c.o: - $(CC) -o $@ $(CFLAGS) -c $< - -all: $(DLLNAME) - -$(DLLNAME): $(OBJECTS) - $(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS) - -clean: - -$(RM) $(OBJECTS) - -realclean: clean - -$(RM) $(DLLNAME) - --include depend
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile.... ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ (original) +++ trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ (removed) @@ -1,69 +1,0 @@ -# Texture compression DJGPP makefile -# Version: 1.1 -# -# Copyright (C) 2004 Daniel Borca All Rights Reserved. -# -# this is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# this is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - -# -# Available options: -# -# Environment variables: -# -# Targets: -# all: build dynamic module -# clean: remove object files -# realclean: remove all generated files -# - - -.PHONY: all clean realclean - -DLLNAME = libdxtn.a - -CC = gcc -CFLAGS = -Wall -W -pedantic -ansi -CFLAGS += -O2 -ffast-math -funroll-loops -#CFLAGS += -fomit-frame-pointer -fexpensive-optimizations - -AR = ar -ARFLAGS = crus - -RM = del - -SOURCES = \ - fxt1.c \ - dxtn.c \ - wrapper.c \ - texstore.c - -OBJECTS = $(SOURCES:.c=.o) - -.c.o: - $(CC) -o $@ $(CFLAGS) -c $< - -all: $(DLLNAME) - -$(DLLNAME): $(OBJECTS) - $(AR) $(ARFLAGS) $@ $^ - -clean: - -$(RM) $(OBJECTS) - -realclean: clean - -$(RM) $(DLLNAME) - --include depend
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile.... ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw (original) +++ trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw (removed) @@ -1,70 +1,0 @@ -# Texture compression MinGW makefile -# Version: 1.1 -# -# Copyright (C) 2004 Daniel Borca All Rights Reserved. -# -# this is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# this is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - -# -# Available options: -# -# Environment variables: -# -# Targets: -# all: build dynamic module -# clean: remove object files -# realclean: remove all generated files -# - - -.PHONY: all clean realclean - -DLLNAME = dxtn.dll - -CC = mingw32-gcc -CFLAGS = -Wall -W -pedantic -ansi -CFLAGS += -O2 -ffast-math -funroll-loops -#CFLAGS += -fomit-frame-pointer -fexpensive-optimizations - -LD = mingw32-gcc -LDFLAGS = -shared -LDLIBS = - -RM = del - -SOURCES = \ - fxt1.c \ - dxtn.c \ - wrapper.c \ - texstore.c - -OBJECTS = $(SOURCES:.c=.o) - -.c.o: - $(CC) -o $@ $(CFLAGS) -c $< - -all: $(DLLNAME) - -$(DLLNAME): $(OBJECTS) - $(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS) - -clean: - -$(RM) *.o - -realclean: clean - -$(RM) $(DLLNAME) - --include depend
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile.vc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile.... ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/Makefile.vc (original) +++ trunk/reactos/dll/3rdparty/dxtn/Makefile.vc (removed) @@ -1,69 +1,0 @@ -# Texture compression VisualC(++) makefile -# Version: 1.1 -# -# Copyright (C) 2004 Daniel Borca All Rights Reserved. -# -# this is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# this is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - -# -# Available options: -# -# Environment variables: -# -# Targets: -# all: build dynamic module -# clean: remove object files -# realclean: remove all generated files -# - - -.PHONY: all clean realclean - -DLLNAME = dxtn.dll - -CC = cl -CFLAGS = -nologo -W3 -WX -D__MSC__=1 -D__WIN32__ -CFLAGS += -DNDEBUG -G6 -O2 - -LD = link -LDFLAGS = -nologo -dll -opt:WIN98 -machine:IX86 -LDLIBS = - -RM = del - -SOURCES = \ - fxt1.c \ - dxtn.c \ - wrapper.c \ - texstore.c - -OBJECTS = $(SOURCES:.c=.o) - -.c.o: - $(CC) -Fo$@ $(CFLAGS) -c $< - -all: $(DLLNAME) - -$(DLLNAME): $(OBJECTS) - $(LD) -out:$@ $(LDFLAGS) $^ $(LDLIBS) - -clean: - -$(RM) *.o - -realclean: clean - -$(RM) $(DLLNAME) - --include depend
Removed: trunk/reactos/dll/3rdparty/dxtn/Makefile.wat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile.... ============================================================================== --- trunk/reactos/dll/3rdparty/dxtn/Makefile.wat (original) +++ trunk/reactos/dll/3rdparty/dxtn/Makefile.wat (removed) @@ -1,71 +1,0 @@ -# Texture compression OpenWatcom makefile -# Version: 1.1 -# -# Copyright (C) 2004 Daniel Borca All Rights Reserved. -# -# this is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# this is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Make; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - -# -# Available options: -# -# Environment variables: -# -# Targets: -# all: build dynamic module -# clean: remove object files -# realclean: remove all generated files -# - - -.PHONY: all clean realclean -.SUFFIXES: .c .obj - -DLLNAME = dxtn.dll - -CC = wcl386 -CFLAGS = -wx -zq -CFLAGS += -ox -6s - -LD = wcl386 -LDFLAGS = -zq -bd -LDLIBS = - -RM = del - -SOURCES = \ - fxt1.c \ - dxtn.c \ - wrapper.c \ - texstore.c - -OBJECTS = $(SOURCES:.c=.obj) - -.c.obj: - $(CC) -fo=$@ $(CFLAGS) -c $< - -all: $(DLLNAME) - -$(DLLNAME): $(OBJECTS) - $(LD) -fe=$@ $(LDFLAGS) $^ $(LDLIBS) - -clean: - $(RM) *.obj - $(RM) *.err - -realclean: clean - $(RM) $(DLLNAME) - --include depend