[paragui-cvs] CVS: paragui/src Makefile.am,1.3.2.2,1.3.2.3 paragui.cpp,1.3,1.3.2.1

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src
In directory subversions:/tmp/cvs-serv4328/src

Modified Files:
      Tag: devel-opengl
        Makefile.am paragui.cpp 
Log Message:
massive changes - updates from main trunk and various bugfixes


Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/Makefile.am,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** Makefile.am 26 Jun 2002 03:25:04 -0000      1.3.2.2
--- Makefile.am 31 Aug 2002 04:01:22 -0000      1.3.2.3
***************
*** 1,7 ****
! SUBDIRS = physfs $(EXPAT_SUBDIR) draw font themes core widgets
  
! DIST_SUBDIRS = $(SUBDIRS) expat
! 
! lib_LTLIBRARIES = libparagui2.la
  
  EXTRA_DIST =
--- 1,20 ----
! SUBDIRS = \
!       $(PHYSFS_SUBDIR) \
!       $(EXPAT_SUBDIR) \
!       layout \
!       factory \
!       draw \
!       font \
!       themes \
!       core \
!       widgets
! 
! DIST_SUBDIRS = \
!       $(SUBDIRS) \
!       expat \
!       physfs
  
! lib_LTLIBRARIES = \
!       libparagui2.la
  
  EXTRA_DIST =
***************
*** 15,25 ****
  
  libparagui2_la_LIBADD = \
-       address@hidden@/lib \
-       -lz \
        $(SIGC_LIBS) \
        $(SDL_LIBS) \
        $(IMAGE_LIBS) \
        $(EXPAT_LIB) \
!       ./physfs/libphysfs.la \
        ./draw/libpgdraw.la \
        ./font/libpgfont.la \
--- 28,38 ----
  
  libparagui2_la_LIBADD = \
        $(SIGC_LIBS) \
        $(SDL_LIBS) \
        $(IMAGE_LIBS) \
        $(EXPAT_LIB) \
!       $(PHYSFS_LIB) \
!       ./layout/libpglayout.la \
!       ./factory/libpgfactory.la \
        ./draw/libpgdraw.la \
        ./font/libpgfont.la \

Index: paragui.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/paragui.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** paragui.cpp 15 Apr 2002 13:35:35 -0000      1.3
--- paragui.cpp 31 Aug 2002 04:01:22 -0000      1.3.2.1
***************
*** 29,37 ****
  #include "pginfo.h"
  #include "paragui.h"
- #ifdef WIN32
- #include "paraconfig_win32.h"
- #else
- #include "paraconfig_gnu.h"
- #endif
  #include "pglog.h"
  
--- 29,32 ----