[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui CWProject.zip,1.1,1.2 CWparagui.txt,1.1,1.2 .
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui CWProject.zip,1.1,1.2 CWparagui.txt,1.1,1.2 .cvsignore,1.2,1.3 COPYING,1.1.1.1,1.2 CREDITS,1.1.1.1,1.2 Makefile.am,1.5,1.6 autogen.sh,1.3,1.4 configure.in,1.17,1.18 RELEASENOTES.Beta1,1.1.1.1,NONE RELEASENOTES.final,1.1.1.1,NONE VisualC.html,1.1.1.1,NONE acconfig.h,1.1.1.1,NONE |
Date: |
Sun, 18 Aug 2002 04:13:23 -0400 |
Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv12482
Modified Files:
.cvsignore COPYING CREDITS Makefile.am autogen.sh configure.in
Added Files:
CWProject.zip CWparagui.txt
Removed Files:
RELEASENOTES.Beta1 RELEASENOTES.final VisualC.html acconfig.h
Log Message:
synced with the devel-1-0-x tree.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/paragui/paragui/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore 15 Apr 2002 13:35:35 -0000 1.2
--- .cvsignore 18 Aug 2002 08:12:50 -0000 1.3
***************
*** 28,29 ****
--- 28,31 ----
*.kdevelop
*.cache
+ *.mlz
+ *.rtf
Index: COPYING
===================================================================
RCS file: /cvsroot/paragui/paragui/COPYING,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** COPYING 15 Apr 2002 13:22:10 -0000 1.1.1.1
--- COPYING 18 Aug 2002 08:12:50 -0000 1.2
***************
*** 1,5 ****
ParaGUI - crossplatform widgetset
! Copyright (C) 2000, 2001 Alexander Pipelka
This library is free software; you can redistribute it and/or
--- 1,5 ----
ParaGUI - crossplatform widgetset
! Copyright (C) 2000, 2001, 2002 Alexander Pipelka
This library is free software; you can redistribute it and/or
Index: CREDITS
===================================================================
RCS file: /cvsroot/paragui/paragui/CREDITS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CREDITS 15 Apr 2002 13:22:10 -0000 1.1.1.1
--- CREDITS 18 Aug 2002 08:12:50 -0000 1.2
***************
*** 4,7 ****
--- 4,11 ----
for the great SDL library <http://www.libsdl.org>.
+ Keith Swyer <address@hidden>:
+ MacOS support
+ CodeWarrior 7 project files
+
David Hedbor <address@hidden>:
GCC 3.0/Win32 testing
***************
*** 47,50 ****
--- 51,55 ----
Thanks to the many people providing patches, fixes & ideas:
+ Andrew Ford
Brian T. Crowder
Oliver Lietz
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.am 25 Jun 2002 21:31:57 -0000 1.5
--- Makefile.am 18 Aug 2002 08:12:50 -0000 1.6
***************
*** 1,7 ****
! AUTOMAKE_OPTIONS = 1.4
SUBDIRS = include src data
! DIST_SUBDIRS = $(SUBDIRS) test
bin_SCRIPTS = paragui2-config
--- 1,7 ----
! DISTCHECK_CONFIGURE_FLAGS=--enable-internalexpat --enable-internalphysfs
SUBDIRS = include src data
! DIST_SUBDIRS = $(SUBDIRS) doc test sdk
bin_SCRIPTS = paragui2-config
***************
*** 16,23 ****
INSTALL \
TODO \
- RELEASENOTES.final \
- VisualC.html \
VisualC.zip \
! mkdist-beos.sh
m4datadir = $(datadir)/aclocal
--- 16,28 ----
INSTALL \
TODO \
VisualC.zip \
! mkdist-beos.sh \
! CWparagui.txt \
! CWProject.zip \
! depcomp
!
!
! depcomp:
! touch depcomp
m4datadir = $(datadir)/aclocal
***************
*** 30,39 ****
release:
- if test ! -f $(top_builddir)/test/Makefile; then \
- mkdir -p $(top_builddir)/test ; \
- cd $(top_builddir)/test ; ../$(srcdir)/test/configure
--disable-paraguitest ; \
- fi
rm -f $(top_builddir)/VisualC.zip
rm -f $(top_builddir)/data/*.zip
make dist
--- 35,41 ----
release:
rm -f $(top_builddir)/VisualC.zip
rm -f $(top_builddir)/data/*.zip
+ rm -f $(top_builddir)/sdk/*.tar.gz
make dist
***************
*** 41,47 ****
touch `find`
- clean:
- rm -f $(top_builddir)/VisualC.zip
-
VisualC.zip:
mkdir -p $(top_builddir)/VC-build
--- 43,46 ----
***************
*** 50,57 ****
dsp=`find $(top_builddir)/VC-build/VisualC -name "*.dsp"`; \
mak=`find $(top_builddir)/VC-build/VisualC -name "*.mak"`; \
! for file in $$dsp $$dsw $$mak; do \
unix2dos $$file || echo "unix2dos not found!"; \
done
! rm -f $(top_builddir)/VisualC.zip && cd $(top_builddir)/VC-build && zip
-9 -r $(TOP_BUILDDIR)/VisualC.zip VisualC -i *.dsp *.dsw *.mak
rm -Rf $(top_builddir)/VC-build
--- 49,56 ----
dsp=`find $(top_builddir)/VC-build/VisualC -name "*.dsp"`; \
mak=`find $(top_builddir)/VC-build/VisualC -name "*.mak"`; \
! for file in $$dsp $$dsw $$mak $$rc $$h
$(top_builddir)/VC-build/VisualC/paragui_dynamic/resource.h
$(top_builddir)/VC-build/VisualC/paragui_dynamic/Version.rc; do \
unix2dos $$file || echo "unix2dos not found!"; \
done
! rm -f $(top_builddir)/VisualC.zip && cd $(top_builddir)/VC-build && zip
-9 -r $(TOP_BUILDDIR)/VisualC.zip VisualC -i *.dsp *.dsw *.mak *.rc *.h
rm -Rf $(top_builddir)/VC-build
***************
*** 62,73 ****
mkdir $(distdir)/lib
cp $(srcdir)/lib/README.txt $(distdir)/lib
- rm -f $(distdir)/VisualC.zip
- cp -f $(top_builddir)/VisualC.zip $(distdir)
- rm -f $(distdir)/data/*.zip
- cp -f $(top_builddir)/data/*.zip $(distdir)/data
-
- dist_bz2: $(PACKAGE)-$(VERSION).tar.gz
- gzip -c -d $(PACKAGE)-$(VERSION).tar.gz > $(PACKAGE)-$(VERSION).tar
- bzip2 $(PACKAGE)-$(VERSION).tar
install-hook:
--- 61,64 ----
***************
*** 77,92 ****
cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
rpm -ba $(PACKAGE).spec
-
- rpm_i686: $(PACKAGE)-$(VERSION).tar.gz
- cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
- rpm -ba --target=i686-linux $(PACKAGE).spec
-
- rpm_i586: $(PACKAGE)-$(VERSION).tar.gz
- cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
- rpm -ba --target i586-linux $(PACKAGE).spec
-
- rpm_i486: $(PACKAGE)-$(VERSION).tar.gz
- cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
- rpm -ba --target=i486-linux $(PACKAGE).spec
dist-beos:
--- 68,71 ----
Index: autogen.sh
===================================================================
RCS file: /cvsroot/paragui/paragui/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** autogen.sh 26 Jun 2002 08:32:34 -0000 1.3
--- autogen.sh 18 Aug 2002 08:12:50 -0000 1.4
***************
*** 29,36 ****
autoconf || ( echo "***ERROR*** autoconf failed." ; exit 1 )
- #echo "Running autogen.sh in the \"test\" directory ..."
- #cp -f paragui.m4 test/acinclude.m4
- #test/autogen.sh
-
echo
echo "Checking for tools needed to maintain the package ..."
--- 29,32 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** configure.in 27 Jun 2002 14:37:11 -0000 1.17
--- configure.in 18 Aug 2002 08:12:50 -0000 1.18
***************
*** 1,4 ****
dnl Process this file with autoconf to produce a configure script.
! AC_INIT(Makefile.am)
AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
--- 1,5 ----
dnl Process this file with autoconf to produce a configure script.
!
! AC_INIT(README)
AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
***************
*** 65,72 ****
AC_EXEEXT
! if test "$prefix" = "NONE"; then
! prefix="/usr/local"
! fi
! LIBS="-L$prefix/lib $LIBS"
dnl Add verbose warnings by default, and allow ANSI compliance checking
--- 66,73 ----
AC_EXEEXT
! dnl if test "$prefix" = "NONE"; then
! dnl prefix="/usr/local"
! dnl fi
! dnl LIBS="-L$prefix/lib $LIBS"
dnl Add verbose warnings by default, and allow ANSI compliance checking
***************
*** 98,108 ****
have_mpatrol_include=no
- dnl have_iberty=no
- dnl AC_CHECK_LIB(iberty, buildargv, have_iberty=yes)
-
- dnl if test x$have_iberty = xno; then
- dnl AC_MSG_ERROR([*** Unable to find iberty library! (needed for mpatrol)])
- dnl fi
-
AC_CHECK_LIB(mpatrol, malloc, have_mpatrol_lib=yes, , -lbfd -liberty)
--- 99,102 ----
***************
*** 117,121 ****
fi
! AC_DEFINE(MPATROL_ENABLED)
EXTRA_LIBS="$EXTRA_LIBS -lmpatrol -lbfd -liberty"
fi
--- 111,115 ----
fi
! AC_DEFINE([MPATROL_ENABLED], 1, [Define if we enabled mpatrol])
EXTRA_LIBS="$EXTRA_LIBS -lmpatrol -lbfd -liberty"
fi
***************
*** 132,136 ****
CROSSCOMPILE=NO
- PHYSFS_PLATFORMFILE=platform/unix.c
dnl The alpha architecture needs special flags for binary portability
--- 126,129 ----
***************
*** 147,163 ****
fi
CROSSCOMPILE=YES
- PHYSFS_PLATFORMFILE=platform/win32.c
- ;;
- *-*-darwin*)
- PHYSFS_PLATFORMFILE=platform/darwin.c
- ;;
- *-*-freebsd*)
- PHYSFS_PLATFORMFILE=platform/freebsd.c
- ;;
- *-*-irix*)
- PHYSFS_PLATFORMFILE=platform/irix.c
- ;;
- *-*-solaris*)
- PHYSFS_PLATFORMFILE=platform/solaris.c
;;
alpha*-*-linux*)
--- 140,143 ----
***************
*** 167,176 ****
ac_default_prefix=/boot/develop/tools/gnupro
LIBSTDCPP="-lstdc++.r4"
- PHYSFS_PLATFORMFILE=platform/beos.c
;;
esac
- AC_SUBST(PHYSFS_PLATFORMFILE)
-
AC_MSG_CHECKING(for the STL library to use)
if test "$STLPORTPREFIX" != "no"; then
--- 147,153 ----
***************
*** 184,188 ****
CPPFLAGS="-I$INCSTLPORT $CPPFLAGS"
STL_CFLAGS="-I$INCSTLPORT"
!
dnl detecting what stlport library to use is tricky since
dnl it uses a weird naming scheme by appending the compiler
--- 161,165 ----
CPPFLAGS="-I$INCSTLPORT $CPPFLAGS"
STL_CFLAGS="-I$INCSTLPORT"
!
dnl detecting what stlport library to use is tricky since
dnl it uses a weird naming scheme by appending the compiler
***************
*** 345,349 ****
AC_SUBST(LIBEXPAT)
-
dnl Check for physfs
--- 322,325 ----
***************
*** 355,360 ****
internalphysfs=no
AC_ARG_ENABLE(internalphysfs,
! [ --enable-internalphysfs enable internal physfs version],
! internalphysfs=yes
)
--- 331,336 ----
internalphysfs=no
AC_ARG_ENABLE(internalphysfs,
! [ --enable-internalphysfs enable internal physfs version],
! internalphysfs=yes
)
***************
*** 367,375 ****
if test x$have_physfs_include = xno; then
! AC_MSG_ERROR(
! [*** Unable to find PhysFS header file!
(http://www.icculus.org/physfs)]
! [Please install the library and header files if you want to
link to the shared library,]
! [or run './configure --enable-internalphysfs' to compile an
internal version of physfs.]
! )
fi
--- 343,351 ----
if test x$have_physfs_include = xno; then
! AC_MSG_ERROR(
! [*** Unable to find PhysFS header file!
(http://www.icculus.org/physfs)]
! [Please install the library and header files if you want to
link to the shared library,]
! [or run './configure --enable-internalphysfs' to compile an
internal version of physfs.]
! )
fi
***************
*** 377,388 ****
if test x$have_physfs_lib = xno; then
! AC_MSG_ERROR(
! [*** Unable to find PhysFS library!
(http://www.icculus.org/physfs)]
! [Please install the library and header files if you want to link
to the shared library,]
! [or run './configure --enable-internalphysfs' to compile an
internal version of physfs.]
! )
fi
else
- AC_CONFIG_SUBDIRS(src/physfs)
PHYSFS_INCLUDE="-I\$(srcdir)/../physfs"
PHYSFS_LIB="./physfs/libphysfs.la"
--- 353,363 ----
if test x$have_physfs_lib = xno; then
! AC_MSG_ERROR(
! [*** Unable to find PhysFS library! (http://www.icculus.org/physfs)]
! [Please install the library and header files if you want to link to
the shared library,]
! [or run './configure --enable-internalphysfs' to compile an
internal version of physfs.]
! )
fi
else
PHYSFS_INCLUDE="-I\$(srcdir)/../physfs"
PHYSFS_LIB="./physfs/libphysfs.la"
***************
*** 391,394 ****
--- 366,371 ----
fi
+ AC_CONFIG_SUBDIRS(src/physfs)
+
AC_SUBST(PHYSFS_INCLUDE)
AC_SUBST(PHYSFS_LIB)
***************
*** 396,399 ****
--- 373,377 ----
AC_SUBST(LIBPHYSFS)
+
dnl Check for other files
AC_LANG_CPLUSPLUS
***************
*** 412,416 ****
else
RTTI_FLAGS=""
! AC_DEFINE(RTTI_ENABLED)
AC_MSG_RESULT([compile with default rtti (no flags)])
fi
--- 390,394 ----
else
RTTI_FLAGS=""
! AC_DEFINE([RTTI_ENABLED], 1, [Define if we enabled runtime type infos])
AC_MSG_RESULT([compile with default rtti (no flags)])
fi
***************
*** 426,443 ****
if test "$STL_CFLAGS" != ""; then
AC_MSG_RESULT([using stlport, exceptions required])
! AC_DEFINE(EXCEPTIONS_ENABLED)
elif test "x$mpatrol" = xyes; then
AC_MSG_RESULT([using mpatrol, exceptions required])
! AC_DEFINE(EXCEPTIONS_ENABLED)
else
if test "x$exceptions" = xyes; then
EXCEPTIONS_FLAGS=""
AC_MSG_RESULT([compile with default exceptions (no flags)])
! AC_DEFINE(EXCEPTIONS_ENABLED)
else
EXCEPTIONS_FLAGS="-fno-exceptions"
AC_MSG_RESULT([compile with -fno-exceptions])
fi
! fi
dnl Check for --enable-debug flag
--- 404,421 ----
if test "$STL_CFLAGS" != ""; then
AC_MSG_RESULT([using stlport, exceptions required])
! AC_DEFINE([EXCEPTIONS_ENABLED], 1, [Define if exceptions are enabled])
elif test "x$mpatrol" = xyes; then
AC_MSG_RESULT([using mpatrol, exceptions required])
! AC_DEFINE([EXCEPTIONS_ENABLED], 1, [Define if exceptions are enabled])
else
if test "x$exceptions" = xyes; then
EXCEPTIONS_FLAGS=""
AC_MSG_RESULT([compile with default exceptions (no flags)])
! AC_DEFINE([EXCEPTIONS_ENABLED], 1, [Define if exceptions are enabled])
else
EXCEPTIONS_FLAGS="-fno-exceptions"
AC_MSG_RESULT([compile with -fno-exceptions])
fi
! fi
dnl Check for --enable-debug flag
***************
*** 464,468 ****
PARAGUI_THEMEDIR=$SDL_PREFIX/share/paragui2
fi
! AC_DEFINE_UNQUOTED(PARAGUI_THEMEDIR, "$PARAGUI_THEMEDIR")
--- 442,446 ----
PARAGUI_THEMEDIR=$SDL_PREFIX/share/paragui2
fi
! AC_DEFINE_UNQUOTED([PARAGUI_THEMEDIR], "$PARAGUI_THEMEDIR", [default
directory for themes])
***************
*** 480,484 ****
sdlimage=no
)
!
AC_MSG_CHECKING([for SDL_image support])
if test "x$sdlimage" = xno; then
--- 458,462 ----
sdlimage=no
)
!
AC_MSG_CHECKING([for SDL_image support])
if test "x$sdlimage" = xno; then
***************
*** 487,491 ****
else
have_SDL_image=yes
! AC_DEFINE(HAVE_SDLIMAGE)
AC_MSG_RESULT([compile with SDL_image support])
fi
--- 465,469 ----
else
have_SDL_image=yes
! AC_DEFINE([HAVE_SDLIMAGE], 1, [Define if we have SDL_image])
AC_MSG_RESULT([compile with SDL_image support])
fi
***************
*** 496,499 ****
--- 474,478 ----
IMAGE_LIBS="-lSDL_image"
IMAGE_INCLUDE="$IMAGE_INCLUDE"
+ AC_DEFINE([HAVE_SDLIMAGE], 1, [Define if we have SDL_image])
else
IMAGE_LIBS=""
***************
*** 517,521 ****
AC_CHECK_FUNCS(vsnprintf)
! AC_CHECK_FUNCS(strsep)
PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS
$RTTI_FLAGS $EXTRA_FLAGS"
--- 496,505 ----
AC_CHECK_FUNCS(vsnprintf)
! AC_CHECK_FUNCS(strtok)
! AC_CHECK_FUNCS(strdup)
! AC_CHECK_HEADER(fnmatch.h,have_fnmatch_h=yes)
! if test x$have_fnmatch_h = xyes; then
! AC_CHECK_FUNCS(fnmatch)
! fi
PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS
$RTTI_FLAGS $EXTRA_FLAGS"
***************
*** 544,547 ****
--- 528,532 ----
AC_OUTPUT([
Makefile
+ doc/Makefile
include/Makefile
src/Makefile
***************
*** 555,558 ****
--- 540,548 ----
src/factory/Makefile
data/Makefile
+ test/Makefile
+ test/fireworks/Makefile
+ test/colorselector/Makefile
+ test/keyboard/Makefile
+ sdk/Makefile
paragui2.spec
paragui2-config
--- RELEASENOTES.Beta1 DELETED ---
--- RELEASENOTES.final DELETED ---
--- VisualC.html DELETED ---
--- acconfig.h DELETED ---
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui CWProject.zip,1.1,1.2 CWparagui.txt,1.1,1.2 .cvsignore,1.2,1.3 COPYING,1.1.1.1,1.2 CREDITS,1.1.1.1,1.2 Makefile.am,1.5,1.6 autogen.sh,1.3,1.4 configure.in,1.17,1.18 RELEASENOTES.Beta1,1.1.1.1,NONE RELEASENOTES.final,1.1.1.1,NONE VisualC.html,1.1.1.1,NONE acconfig.h,1.1.1.1,NONE,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/VisualC/paragui_dynamic .cvsignore,1.1,1.2 Version.rc,1.1,1.2 resource.h,1.1,1.2 paragui_dynamic.dsp,1.1.1.1,1.2 paragui_dynamic.mak,1.1.1.1,1.2
- Next by Date:
[paragui-cvs] CVS: paragui/bin .cvsignore,NONE,1.2.2.1
- Previous by thread:
[paragui-cvs] CVS: paragui/VisualC/paragui_dynamic .cvsignore,1.1,1.2 Version.rc,1.1,1.2 resource.h,1.1,1.2 paragui_dynamic.dsp,1.1.1.1,1.2 paragui_dynamic.mak,1.1.1.1,1.2
- Next by thread:
[paragui-cvs] CVS: paragui/bin .cvsignore,NONE,1.2.2.1
- Index(es):