Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f7f6abe24d |
@@ -2,6 +2,9 @@
|
||||
How to build the sources from CVS
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
|
||||
etc. alongside these instructions.
|
||||
|
||||
I) Windows using plain makefiles
|
||||
----------------------------------------
|
||||
|
||||
|
||||
383
Makefile.in
383
Makefile.in
@@ -1,11 +1,12 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Julian Smart, Robert Roebling, Vadim Zeitlin
|
||||
# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
|
||||
# Created: 1993
|
||||
# Updated: 1999
|
||||
# Updated: 2001
|
||||
# Copyright:(c) 1993, AIAI, University of Edinburgh,
|
||||
# Copyright:(c) 1999, Vadim Zeitlin
|
||||
# Copyright:(c) 1999, Robert Roebling
|
||||
# Copyright:(c) 2001, Ron Lee
|
||||
#
|
||||
# Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a
|
||||
|
||||
@@ -15,24 +16,22 @@ include ./src/make.env
|
||||
|
||||
############## override make.env for PIC ##########################
|
||||
|
||||
# Clears all default suffixes
|
||||
.SUFFIXES: .o .cpp .c .cxx
|
||||
%.o : %.c
|
||||
$(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
|
||||
|
||||
.c.o :
|
||||
$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
|
||||
%.o : %.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
|
||||
|
||||
.cpp.o :
|
||||
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
|
||||
|
||||
.cxx.o :
|
||||
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
|
||||
%.o : %.cxx
|
||||
$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
|
||||
|
||||
########################### Paths #################################
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
VP1 = @top_srcdir@/src/common
|
||||
VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
|
||||
VP1 = @TOOLKIT_VPATH@
|
||||
VP2 = @top_srcdir@/src/common
|
||||
VP3 = @top_srcdir@/src/motif/xmcombo
|
||||
VP4 = @top_srcdir@/src/generic
|
||||
VP5 = @top_srcdir@/src/unix
|
||||
@@ -42,54 +41,51 @@ VP8 = @top_srcdir@/src/jpeg
|
||||
VP9 = @top_srcdir@/src/tiff
|
||||
VP10 = @top_srcdir@/src/zlib
|
||||
VP11 = @top_srcdir@/src/iodbc
|
||||
VP12 = @top_srcdir@/src/msw/ole
|
||||
|
||||
FTVP01 = @top_srcdir@/src/freetype/unix
|
||||
FTVP02 = @top_srcdir@/src/freetype/autohint
|
||||
FTVP03 = @top_srcdir@/src/freetype/base
|
||||
FTVP04 = @top_srcdir@/src/freetype/cff
|
||||
FTVP05 = @top_srcdir@/src/freetype/cid
|
||||
FTVP06 = @top_srcdir@/src/freetype/macfond
|
||||
FTVP07 = @top_srcdir@/src/freetype/otlayout
|
||||
FTVP08 = @top_srcdir@/src/freetype/psnames
|
||||
FTVP09 = @top_srcdir@/src/freetype/raster1
|
||||
FTVP10 = @top_srcdir@/src/freetype/sfnt
|
||||
FTVP11 = @top_srcdir@/src/freetype/smooth
|
||||
FTVP12 = @top_srcdir@/src/freetype/truetype
|
||||
FTVP13 = @top_srcdir@/src/freetype/type1
|
||||
FTVP14 = @top_srcdir@/src/freetype/type1z
|
||||
FTVP15 = @top_srcdir@/src/freetype/winfonts
|
||||
|
||||
VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
|
||||
VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
|
||||
|
||||
# the comment at the end of the next line is needed because otherwise autoconf
|
||||
# would remove this line completely - it contains a built-in hack to remove
|
||||
# any VPATH assignment not containing ':'
|
||||
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
|
||||
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
|
||||
|
||||
top_srcdir = @top_srcdir@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
bindir = @bindir@
|
||||
sbindir = @sbindir@
|
||||
libexecdir = @libexecdir@
|
||||
datadir = @datadir@
|
||||
sysconfdir = @sysconfdir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
|
||||
DESTDIR =
|
||||
|
||||
localedir = $(datadir)/locale
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
|
||||
top_builddir = .
|
||||
build_libdir = $(top_builddir)/lib
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
# my autoconf doesn't set this
|
||||
#INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
# maybe do an additional chmod if needed?
|
||||
INSTALL_SCRIPT = @INSTALL@
|
||||
transform = @program_transform_name@
|
||||
|
||||
NORMAL_INSTALL = :
|
||||
PRE_INSTALL = :
|
||||
POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_alias = @build_alias@
|
||||
build_triplet = @build@
|
||||
host_alias = @host_alias@
|
||||
@@ -118,7 +114,9 @@ GTKDIR = $(WXDIR)/src/gtk
|
||||
MOTIFDIR = $(WXDIR)/src/motif
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
PMDIR = $(WXDIR)/src/os2
|
||||
MACDIR = $(WXDIR)/src/mac
|
||||
ODBCDIR = $(WXDIR)/src/iodbc
|
||||
FTDIR = $(WXDIR)/src/freetype
|
||||
INCDIR = $(WXDIR)/include
|
||||
SAMPDIR = $(WXDIR)/samples
|
||||
DEMODIR = $(WXDIR)/demos
|
||||
@@ -130,15 +128,17 @@ INTLDIR = $(WXDIR)/locale
|
||||
|
||||
########################## Archive name ###############################
|
||||
|
||||
WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
|
||||
WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
|
||||
WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
|
||||
WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.gz
|
||||
# append a version suffix x.y.z to all file names
|
||||
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
|
||||
WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
|
||||
WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
|
||||
WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
|
||||
WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
|
||||
|
||||
WXARCHIVE_BZIP = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
|
||||
WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
|
||||
WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
|
||||
WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tar.bz2
|
||||
WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
|
||||
WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
|
||||
WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
|
||||
WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
|
||||
|
||||
DISTDIR = ./_dist_dir/@DISTDIR@
|
||||
|
||||
@@ -158,7 +158,6 @@ HEADERS = $(ALL_HEADERS)
|
||||
# for the objects and depfiles, we might be bulding only part of them
|
||||
# depending on configure arguments, so select a subset of ALL
|
||||
OBJECTS = @ALL_OBJECTS@
|
||||
DEPFILES = @ALL_DEPFILES@
|
||||
|
||||
# the object files of sublibraries (we assume that they don't change [often],
|
||||
# so we don't generate these lists with tmake but embed them here)
|
||||
@@ -195,6 +194,24 @@ PNGOBJS = \
|
||||
pngget.o \
|
||||
pngset.o
|
||||
|
||||
FREETYPEOBJS = \
|
||||
ftsystem.o \
|
||||
autohint.o \
|
||||
ftbase.o \
|
||||
ftdebug.o \
|
||||
ftglyph.o \
|
||||
ftinit.o \
|
||||
ftmm.o \
|
||||
cff.o \
|
||||
type1cid.o \
|
||||
psnames.o \
|
||||
psmodule.o \
|
||||
raster1.o \
|
||||
sfnt.o \
|
||||
smooth.o \
|
||||
truetype.o \
|
||||
type1z.o \
|
||||
winfnt.o
|
||||
|
||||
JPEGOBJS = \
|
||||
jcomapi.o \
|
||||
@@ -298,65 +315,45 @@ IODBCOBJS = \
|
||||
|
||||
############################## Rules ##################################
|
||||
|
||||
BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
|
||||
BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
|
||||
SONAME_FLAGS = @SONAME_FLAGS@
|
||||
SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
|
||||
|
||||
all: @WX_ALL@
|
||||
|
||||
@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
|
||||
@$(INSTALL) -d ./lib
|
||||
$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
|
||||
$(RANLIB) ./lib/$@
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
@$(RM) $@
|
||||
$(AR) $(AROPTIONS) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
|
||||
@$(INSTALL) -d ./lib
|
||||
$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
|
||||
$(RANLIB) ./lib/$@
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
@$(RM) $@
|
||||
$(AR) $(AROPTIONS) $@ glcanvas.o
|
||||
$(RANLIB) $@
|
||||
|
||||
@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
@$(INSTALL) -d ./lib
|
||||
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
|
||||
|
||||
@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
|
||||
@$(INSTALL) -d ./lib
|
||||
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
|
||||
|
||||
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK1@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK2@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK3@
|
||||
cd lib \
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||
@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
|
||||
@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
|
||||
cd $(build_libdir) \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
|
||||
|
||||
CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
|
||||
cd lib \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
|
||||
@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
cd $(build_libdir) \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
|
||||
|
||||
CREATE_INSTALLED_LINKS: preinstall
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK3@
|
||||
cd $(libdir) \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
|
||||
|
||||
CREATE_INSTALLED_LINKS_GL: preinstall_gl
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
||||
cd $(libdir) \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
|
||||
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
|
||||
|
||||
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
|
||||
|
||||
parser.o: parser.c lexer.c
|
||||
@@ -380,7 +377,22 @@ lexer.c: $(COMMDIR)/lexer.l
|
||||
sed -e "s/unput/PROIO_unput/g" > lexer.c
|
||||
@$(RM) @LEX_STEM@.c
|
||||
|
||||
-include $(DEPFILES)
|
||||
-include $(OBJECTS:.o=.d)
|
||||
|
||||
|
||||
CREATE_INSTALLED_LINKS: preinstall
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||
cd $(libdir) \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
|
||||
|
||||
CREATE_INSTALLED_LINKS_GL: preinstall_gl
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
cd $(libdir) \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
|
||||
|
||||
afminstall: preinstall
|
||||
$(INSTALL) -d $(datadir)
|
||||
@@ -392,7 +404,7 @@ afminstall: preinstall
|
||||
|
||||
# this is the real install target: copies the library, wx-config and the
|
||||
# headers to the installation directory
|
||||
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
|
||||
preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
|
||||
@echo " "
|
||||
@echo " Installing wxWindows..."
|
||||
@echo " "
|
||||
@@ -401,20 +413,27 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
|
||||
$(INSTALL) -d $(bindir)
|
||||
$(INSTALL) -d $(libdir)
|
||||
|
||||
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
|
||||
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
|
||||
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
|
||||
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
|
||||
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
||||
@# this installs the import library for a MSW DLL
|
||||
@# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
|
||||
@# import livraru name
|
||||
@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
|
||||
|
||||
$(INSTALL) -d $(libdir)/wx
|
||||
$(INSTALL) -d $(libdir)/wx/include
|
||||
$(INSTALL) -d $(libdir)/wx/include/wx
|
||||
$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
|
||||
$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
|
||||
|
||||
$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
|
||||
$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
|
||||
$(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
|
||||
|
||||
$(INSTALL) -d $(includedir)/wx
|
||||
@# FIXME: This will erroneously install a wx/base dir for wxBase..
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
|
||||
@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
|
||||
|
||||
$(INSTALL) -d $(includedir)/wx/protocol
|
||||
$(INSTALL) -d $(includedir)/wx/unix
|
||||
@list='$(HEADERS)'; for p in $$list; do \
|
||||
@@ -458,16 +477,14 @@ uninstall:
|
||||
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
|
||||
@echo " Removing GL library..."
|
||||
@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
||||
@echo " Removing helper files..."
|
||||
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
|
||||
@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
|
||||
@$(RM) $(bindir)/wx-config
|
||||
@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
|
||||
@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
|
||||
@$(RM) $(datadir)/wx/afm/*
|
||||
@$(RM) $(datadir)/wx/gs_afm/*
|
||||
# FIXME: wxBase doesnt install these next 3 dirs.
|
||||
@@ -486,8 +503,8 @@ uninstall:
|
||||
done
|
||||
@echo " Removing directories..."
|
||||
@-rmdir $(localedir)
|
||||
@if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi
|
||||
@if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
|
||||
@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi
|
||||
@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi
|
||||
@if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
|
||||
@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
|
||||
@if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
|
||||
@@ -537,8 +554,6 @@ ALL_GUI_DIST: ALL_DIST
|
||||
cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
||||
cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
|
||||
cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
|
||||
cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo
|
||||
cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install
|
||||
mkdir $(DISTDIR)/include
|
||||
mkdir $(DISTDIR)/include/wx
|
||||
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
|
||||
@@ -601,17 +616,17 @@ BASE_DIST: ALL_DIST
|
||||
mkdir $(DISTDIR)/include
|
||||
mkdir $(DISTDIR)/include/wx
|
||||
mkdir $(DISTDIR)/include/wx/protocol
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
mkdir $(DISTDIR)/include/wx/unix
|
||||
mkdir $(DISTDIR)/src/common
|
||||
mkdir $(DISTDIR)/src/msw
|
||||
mkdir $(DISTDIR)/src/unix
|
||||
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
|
||||
cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
|
||||
cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
|
||||
cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
|
||||
cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt
|
||||
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
||||
cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
|
||||
cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt
|
||||
cp $(SRCDIR)/*.in $(DISTDIR)/src
|
||||
cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
||||
cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
|
||||
@@ -654,17 +669,30 @@ MOTIF_DIST: ALL_GUI_DIST
|
||||
cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
|
||||
cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
|
||||
|
||||
MACX_DIST: ALL_GUI_DIST
|
||||
echo "Apple Mac OS X specific distribution not complete"
|
||||
|
||||
MSW_DIST: ALL_GUI_DIST
|
||||
cp $(WXDIR)/wxWINE.spec $(DISTDIR)
|
||||
mkdir $(DISTDIR)/include/wx/msw/ctl3d
|
||||
mkdir $(DISTDIR)/include/wx/msw/gnuwin32
|
||||
mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
|
||||
mkdir $(DISTDIR)/include/wx/msw/ole
|
||||
cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
|
||||
cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
|
||||
cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
|
||||
cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
|
||||
cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
|
||||
cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
|
||||
cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
|
||||
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
|
||||
cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
|
||||
cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
|
||||
|
||||
mkdir $(DISTDIR)/src/msw/ole
|
||||
cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
|
||||
cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
|
||||
cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
|
||||
mkdir $(DISTDIR)/src/msw/ole
|
||||
cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
|
||||
|
||||
DEMOS_DIST: ALL_GUI_DIST
|
||||
@@ -672,9 +700,9 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
|
||||
cp $(DEMODIR)/configure $(DISTDIR)/demos
|
||||
cp $(DEMODIR)/configure.in $(DISTDIR)/demos
|
||||
|
||||
|
||||
cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
|
||||
@@ -682,7 +710,7 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
|
||||
cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/forty
|
||||
cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
|
||||
cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
|
||||
@@ -690,7 +718,7 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
|
||||
cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
|
||||
cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/life
|
||||
mkdir $(DISTDIR)/demos/life/bitmaps
|
||||
cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
|
||||
@@ -701,7 +729,7 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
|
||||
cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
|
||||
cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/poem
|
||||
cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
|
||||
cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
|
||||
@@ -710,12 +738,12 @@ DEMOS_DIST: ALL_GUI_DIST
|
||||
cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
|
||||
cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
|
||||
cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
|
||||
|
||||
|
||||
mkdir $(DISTDIR)/demos/fractal
|
||||
cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
|
||||
cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
|
||||
cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
|
||||
|
||||
|
||||
SAMPLES_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/samples
|
||||
cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
|
||||
@@ -903,8 +931,10 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
|
||||
cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
|
||||
cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
|
||||
cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
|
||||
cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
|
||||
|
||||
mkdir $(DISTDIR)/samples/ipc
|
||||
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
|
||||
@@ -1009,11 +1039,6 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
|
||||
cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
|
||||
|
||||
mkdir $(DISTDIR)/samples/plot
|
||||
cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
|
||||
cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
|
||||
cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
|
||||
|
||||
mkdir $(DISTDIR)/samples/png
|
||||
cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
|
||||
cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
|
||||
@@ -1243,35 +1268,83 @@ PYTHON_DIST:
|
||||
distclean:
|
||||
$(RM) -r _dist_dir
|
||||
|
||||
# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
|
||||
# the files twice
|
||||
dist-only:
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples-$(VER_SUFFIX); \
|
||||
echo "*** Creating wxSamples archive..."; \
|
||||
tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
|
||||
mv wxSamples-$(VER_SUFFIX) samples; \
|
||||
mv demos wxDemos-$(VER_SUFFIX); \
|
||||
echo "*** Creating wxDemos archive..."; \
|
||||
tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
|
||||
mv wxDemos-$(VER_SUFFIX) demos; \
|
||||
fi
|
||||
|
||||
dist: @GUIDIST@
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples; \
|
||||
tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
|
||||
mv wxSamples samples; \
|
||||
mv demos wxDemos; \
|
||||
tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
|
||||
mv wxDemos demos; \
|
||||
mv samples wxSamples-$(VER_SUFFIX); \
|
||||
echo "*** Creating wxSamples archive..."; \
|
||||
tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
|
||||
mv wxSamples-$(VER_SUFFIX) samples; \
|
||||
mv demos wxDemos-$(VER_SUFFIX); \
|
||||
echo "*** Creating wxDemos archive..."; \
|
||||
tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
|
||||
mv wxDemos-$(VER_SUFFIX) demos; \
|
||||
fi
|
||||
|
||||
bzip-dist-only:
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples-${VER_SUFFIX}; \
|
||||
echo "*** Creating wxSamples archive..."; \
|
||||
tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
|
||||
mv wxSamples-${VER_SUFFIX} samples; \
|
||||
mv demos wxDemos-${VER_SUFFIX}; \
|
||||
echo "*** Creating wxDemos archive..."; \
|
||||
tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
|
||||
mv wxDemos-${VER_SUFFIX} demos; \
|
||||
fi
|
||||
|
||||
bzip-dist: @GUIDIST@
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples; \
|
||||
tar ch wxSamples | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
|
||||
mv wxSamples samples; \
|
||||
mv demos wxDemos; \
|
||||
tar ch wxDemos | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
|
||||
mv wxDemos demos; \
|
||||
mv samples wxSamples-${VER_SUFFIX}; \
|
||||
echo "*** Creating wxSamples archive..."; \
|
||||
tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
|
||||
mv wxSamples-${VER_SUFFIX} samples; \
|
||||
mv demos wxDemos-${VER_SUFFIX}; \
|
||||
echo "*** Creating wxDemos archive..."; \
|
||||
tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
|
||||
mv wxDemos-${VER_SUFFIX} demos; \
|
||||
fi
|
||||
|
||||
debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
|
||||
debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
|
||||
mkdir $(DISTDIR)/debian
|
||||
-cp $(WXDIR)/debian/* $(DISTDIR)/debian
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
|
||||
@@ -1279,14 +1352,32 @@ debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
|
||||
cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
|
||||
cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
|
||||
rm -f $(DISTDIR)/*.spec
|
||||
|
||||
@# now prune away a lot of the crap included by using cp -R
|
||||
@# in other dist targets. Ugly and hardly portable but it
|
||||
@# will run on any Debian box and that's enough for now.
|
||||
|
||||
find $(DISTDIR) \( -name "CVS" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
|
||||
\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
|
||||
-print0 | xargs -0 rm -rf
|
||||
|
||||
rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
|
||||
mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
|
||||
|
||||
debian-native-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
|
||||
|
||||
debian-msw-dirs:
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
mkdir $(DISTDIR)/src/msw
|
||||
cp $(WXDIR)/src/msw/files.lst $(DISTDIR)/src/msw
|
||||
|
||||
|
||||
clean:
|
||||
$(RM) *.o
|
||||
$(RM) *.d
|
||||
$(RM) parser.c
|
||||
$(RM) lexer.c
|
||||
$(RM) -r ./lib/*
|
||||
$(RM) -r ./lib/wx/*
|
||||
$(RM) ./lib/lib*
|
||||
|
||||
cleanall: clean
|
||||
|
||||
776
config.guess
vendored
776
config.guess
vendored
File diff suppressed because it is too large
Load Diff
372
config.sub
vendored
372
config.sub
vendored
@@ -1,6 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script, version 1.1.
|
||||
# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2001-09-07'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
# can handle that machine. It does not imply ALL GNU software can.
|
||||
@@ -25,6 +29,8 @@
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# Please send patches to <config-patches@gnu.org>.
|
||||
#
|
||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||
# Supply the specified configuration type as an argument.
|
||||
# If it is invalid, we print an error message on stderr and exit with code 1.
|
||||
@@ -45,30 +51,73 @@
|
||||
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
|
||||
# It is wrong to echo any other type of specification.
|
||||
|
||||
if [ x$1 = x ]
|
||||
then
|
||||
echo Configuration name missing. 1>&2
|
||||
echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
|
||||
echo "or $0 ALIAS" 1>&2
|
||||
echo where ALIAS is a recognized configuration type. 1>&2
|
||||
exit 1
|
||||
fi
|
||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||
|
||||
# First pass through any local machine types.
|
||||
case $1 in
|
||||
*local*)
|
||||
echo $1
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
usage="\
|
||||
Usage: $0 [OPTION] CPU-MFR-OPSYS
|
||||
$0 [OPTION] ALIAS
|
||||
|
||||
Canonicalize a configuration name.
|
||||
|
||||
Operation modes:
|
||||
-h, --help print this help, then exit
|
||||
-t, --time-stamp print date of last modification, then exit
|
||||
-v, --version print version number, then exit
|
||||
|
||||
Report bugs and patches to <config-patches@gnu.org>."
|
||||
|
||||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
||||
help="
|
||||
Try \`$me --help' for more information."
|
||||
|
||||
# Parse command line
|
||||
while test $# -gt 0 ; do
|
||||
case $1 in
|
||||
--time-stamp | --time* | -t )
|
||||
echo "$timestamp" ; exit 0 ;;
|
||||
--version | -v )
|
||||
echo "$version" ; exit 0 ;;
|
||||
--help | --h* | -h )
|
||||
echo "$usage"; exit 0 ;;
|
||||
-- ) # Stop option processing
|
||||
shift; break ;;
|
||||
- ) # Use stdin as input.
|
||||
break ;;
|
||||
-* )
|
||||
echo "$me: invalid option $1$help"
|
||||
exit 1 ;;
|
||||
|
||||
*local*)
|
||||
# First pass through any local machine types.
|
||||
echo $1
|
||||
exit 0;;
|
||||
|
||||
* )
|
||||
break ;;
|
||||
esac
|
||||
done
|
||||
|
||||
case $# in
|
||||
0) echo "$me: missing argument$help" >&2
|
||||
exit 1;;
|
||||
1) ;;
|
||||
*) echo "$me: too many arguments$help" >&2
|
||||
exit 1;;
|
||||
esac
|
||||
|
||||
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
|
||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
linux-gnu*)
|
||||
nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
@@ -94,7 +143,7 @@ case $os in
|
||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||
-apple)
|
||||
-apple | -axis)
|
||||
os=
|
||||
basic_machine=$1
|
||||
;;
|
||||
@@ -105,9 +154,17 @@ case $os in
|
||||
-scout)
|
||||
;;
|
||||
-wrs)
|
||||
os=vxworks
|
||||
os=-vxworks
|
||||
basic_machine=$1
|
||||
;;
|
||||
-chorusos*)
|
||||
os=-chorusos
|
||||
basic_machine=$1
|
||||
;;
|
||||
-chorusrdb)
|
||||
os=-chorusrdb
|
||||
basic_machine=$1
|
||||
;;
|
||||
-hiux*)
|
||||
os=-hiuxwe2
|
||||
;;
|
||||
@@ -156,33 +213,60 @@ case $os in
|
||||
-psos*)
|
||||
os=-psos
|
||||
;;
|
||||
-mint | -mint[0-9]*)
|
||||
basic_machine=m68k-atari
|
||||
os=-mint
|
||||
;;
|
||||
esac
|
||||
|
||||
# Decode aliases for certain CPU-COMPANY combinations.
|
||||
case $basic_machine in
|
||||
# Recognize the basic CPU types without company name.
|
||||
# Some are omitted here because they have special meanings below.
|
||||
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
||||
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
|
||||
| 580 | i960 | h8300 \
|
||||
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
|
||||
| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
|
||||
| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
|
||||
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
|
||||
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
|
||||
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
|
||||
| mips64vr5000 | miprs64vr5000el \
|
||||
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
|
||||
| thumb | d10v)
|
||||
1750a | 580 \
|
||||
| a29k \
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dsp16xx \
|
||||
| fr30 \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| m32r | m68000 | m68k | m88k | mcore \
|
||||
| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
|
||||
| mips64vr4100 | mips64vr4100el | mips64vr4300 \
|
||||
| mips64vr4300el | mips64vr5000 | mips64vr5000el \
|
||||
| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
|
||||
| mipsisa32 \
|
||||
| mn10200 | mn10300 \
|
||||
| ns16k | ns32k \
|
||||
| openrisc \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| s390 | s390x \
|
||||
| sh | sh[34] | sh[34]eb | shbe | shle \
|
||||
| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
|
||||
| stormy16 | strongarm \
|
||||
| tahoe | thumb | tic80 | tron \
|
||||
| v850 \
|
||||
| we32k \
|
||||
| x86 | xscale \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
# because (1) that's what they normally are, and
|
||||
# (2) the word "unknown" tends to confuse beginning users.
|
||||
i[34567]86)
|
||||
i*86 | x86_64)
|
||||
basic_machine=$basic_machine-pc
|
||||
;;
|
||||
# Object if more than one company name word.
|
||||
@@ -191,23 +275,43 @@ case $basic_machine in
|
||||
exit 1
|
||||
;;
|
||||
# Recognize the basic CPU types with company name.
|
||||
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
|
||||
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
|
||||
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
||||
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
|
||||
| xmp-* | ymp-* \
|
||||
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
|
||||
| alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
|
||||
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
|
||||
| clipper-* | orion-* \
|
||||
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
|
||||
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
|
||||
| mips64el-* | mips64orion-* | mips64orionel-* \
|
||||
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| f301-* | armv*-* | t3e-* \
|
||||
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
|
||||
| thumb-* | v850-* | d30v-* | tic30-* | c30-* )
|
||||
580-* \
|
||||
| a29k-* \
|
||||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
||||
| alphapca5[67]-* | arc-* \
|
||||
| arm-* | armbe-* | armle-* | armv*-* \
|
||||
| bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c54x-* \
|
||||
| clipper-* | cray2-* | cydra-* \
|
||||
| d10v-* | d30v-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fr30-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| m32r-* \
|
||||
| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | mcore-* \
|
||||
| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
|
||||
| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
|
||||
| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
|
||||
| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| s390-* | s390x-* \
|
||||
| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
|
||||
| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
|
||||
| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
|
||||
| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
|
||||
| v850-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
@@ -244,14 +348,14 @@ case $basic_machine in
|
||||
os=-sysv
|
||||
;;
|
||||
amiga | amiga-*)
|
||||
basic_machine=m68k-cbm
|
||||
basic_machine=m68k-unknown
|
||||
;;
|
||||
amigaos | amigados)
|
||||
basic_machine=m68k-cbm
|
||||
basic_machine=m68k-unknown
|
||||
os=-amigaos
|
||||
;;
|
||||
amigaunix | amix)
|
||||
basic_machine=m68k-cbm
|
||||
basic_machine=m68k-unknown
|
||||
os=-sysv4
|
||||
;;
|
||||
apollo68)
|
||||
@@ -298,13 +402,16 @@ case $basic_machine in
|
||||
basic_machine=cray2-cray
|
||||
os=-unicos
|
||||
;;
|
||||
[ctj]90-cray)
|
||||
basic_machine=c90-cray
|
||||
[cjt]90)
|
||||
basic_machine=${basic_machine}-cray
|
||||
os=-unicos
|
||||
;;
|
||||
crds | unos)
|
||||
basic_machine=m68k-crds
|
||||
;;
|
||||
cris | cris-* | etrax*)
|
||||
basic_machine=cris-axis
|
||||
;;
|
||||
da30 | da30-*)
|
||||
basic_machine=m68k-da30
|
||||
;;
|
||||
@@ -352,6 +459,10 @@ case $basic_machine in
|
||||
basic_machine=tron-gmicro
|
||||
os=-sysv
|
||||
;;
|
||||
go32)
|
||||
basic_machine=i386-pc
|
||||
os=-go32
|
||||
;;
|
||||
h3050r* | hiux*)
|
||||
basic_machine=hppa1.1-hitachi
|
||||
os=-hiuxwe2
|
||||
@@ -425,22 +536,21 @@ case $basic_machine in
|
||||
;;
|
||||
i370-ibm* | ibm*)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
;;
|
||||
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
||||
i[34567]86v32)
|
||||
i*86v32)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv32
|
||||
;;
|
||||
i[34567]86v4*)
|
||||
i*86v4*)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv4
|
||||
;;
|
||||
i[34567]86v)
|
||||
i*86v)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv
|
||||
;;
|
||||
i[34567]86sol2)
|
||||
i*86sol2)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
os=-solaris2
|
||||
;;
|
||||
@@ -452,14 +562,6 @@ case $basic_machine in
|
||||
basic_machine=i386-unknown
|
||||
os=-vsta
|
||||
;;
|
||||
i386-go32 | go32)
|
||||
basic_machine=i386-unknown
|
||||
os=-go32
|
||||
;;
|
||||
i386-mingw32 | mingw32)
|
||||
basic_machine=i386-unknown
|
||||
os=-mingw32
|
||||
;;
|
||||
iris | iris4d)
|
||||
basic_machine=mips-sgi
|
||||
case $os in
|
||||
@@ -485,10 +587,14 @@ case $basic_machine in
|
||||
basic_machine=ns32k-utek
|
||||
os=-sysv
|
||||
;;
|
||||
mingw32)
|
||||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
*mint | *MiNT)
|
||||
*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
|
||||
basic_machine=m68k-atari
|
||||
os=-mint
|
||||
;;
|
||||
@@ -506,14 +612,22 @@ case $basic_machine in
|
||||
mips3*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
|
||||
;;
|
||||
mmix*)
|
||||
basic_machine=mmix-knuth
|
||||
os=-mmixware
|
||||
;;
|
||||
monitor)
|
||||
basic_machine=m68k-rom68k
|
||||
os=-coff
|
||||
;;
|
||||
msdos)
|
||||
basic_machine=i386-unknown
|
||||
basic_machine=i386-pc
|
||||
os=-msdos
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
;;
|
||||
ncr3000)
|
||||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
@@ -523,7 +637,7 @@ case $basic_machine in
|
||||
os=-netbsd
|
||||
;;
|
||||
netwinder)
|
||||
basic_machine=armv4l-corel
|
||||
basic_machine=armv4l-rebel
|
||||
os=-linux
|
||||
;;
|
||||
news | news700 | news800 | news900)
|
||||
@@ -571,9 +685,16 @@ case $basic_machine in
|
||||
basic_machine=i960-intel
|
||||
os=-mon960
|
||||
;;
|
||||
nonstopux)
|
||||
basic_machine=mips-compaq
|
||||
os=-nonstopux
|
||||
;;
|
||||
np1)
|
||||
basic_machine=np1-gould
|
||||
;;
|
||||
nsr-tandem)
|
||||
basic_machine=nsr-tandem
|
||||
;;
|
||||
op50n-* | op60c-*)
|
||||
basic_machine=hppa1.1-oki
|
||||
os=-proelf
|
||||
@@ -603,28 +724,28 @@ case $basic_machine in
|
||||
pc532 | pc532-*)
|
||||
basic_machine=ns32k-pc532
|
||||
;;
|
||||
pentium | p5 | k5 | k6 | nexen)
|
||||
pentium | p5 | k5 | k6 | nexgen)
|
||||
basic_machine=i586-pc
|
||||
;;
|
||||
pentiumpro | p6 | 6x86)
|
||||
pentiumpro | p6 | 6x86 | athlon)
|
||||
basic_machine=i686-pc
|
||||
;;
|
||||
pentiumii | pentium2)
|
||||
basic_machine=i786-pc
|
||||
basic_machine=i686-pc
|
||||
;;
|
||||
pentium-* | p5-* | k5-* | k6-* | nexen-*)
|
||||
pentium-* | p5-* | k5-* | k6-* | nexgen-*)
|
||||
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentiumpro-* | p6-* | 6x86-*)
|
||||
pentiumpro-* | p6-* | 6x86-* | athlon-*)
|
||||
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentiumii-* | pentium2-*)
|
||||
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pn)
|
||||
basic_machine=pn-gould
|
||||
;;
|
||||
power) basic_machine=rs6000-ibm
|
||||
power) basic_machine=power-ibm
|
||||
;;
|
||||
ppc) basic_machine=powerpc-unknown
|
||||
;;
|
||||
@@ -636,9 +757,23 @@ case $basic_machine in
|
||||
ppcle-* | powerpclittle-*)
|
||||
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppc64) basic_machine=powerpc64-unknown
|
||||
;;
|
||||
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
|
||||
basic_machine=powerpc64le-unknown
|
||||
;;
|
||||
ppc64le-* | powerpc64little-*)
|
||||
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ps2)
|
||||
basic_machine=i386-ibm
|
||||
;;
|
||||
pw32)
|
||||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rom68k)
|
||||
basic_machine=m68k-rom68k
|
||||
os=-coff
|
||||
@@ -718,6 +853,10 @@ case $basic_machine in
|
||||
sun386 | sun386i | roadrunner)
|
||||
basic_machine=i386-sun
|
||||
;;
|
||||
sv1)
|
||||
basic_machine=sv1-cray
|
||||
os=-unicos
|
||||
;;
|
||||
symmetry)
|
||||
basic_machine=i386-sequent
|
||||
os=-dynix
|
||||
@@ -726,6 +865,10 @@ case $basic_machine in
|
||||
basic_machine=t3e-cray
|
||||
os=-unicos
|
||||
;;
|
||||
tic54x | c54x*)
|
||||
basic_machine=tic54x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tx39)
|
||||
basic_machine=mipstx39-unknown
|
||||
;;
|
||||
@@ -778,6 +921,10 @@ case $basic_machine in
|
||||
basic_machine=hppa1.1-winbond
|
||||
os=-proelf
|
||||
;;
|
||||
windows32)
|
||||
basic_machine=i386-pc
|
||||
os=-windows32-msvcrt
|
||||
;;
|
||||
xmp)
|
||||
basic_machine=xmp-cray
|
||||
os=-unicos
|
||||
@@ -821,13 +968,20 @@ case $basic_machine in
|
||||
vax)
|
||||
basic_machine=vax-dec
|
||||
;;
|
||||
pdp10)
|
||||
# there are many clones, so DEC is not a safe bet
|
||||
basic_machine=pdp10-unknown
|
||||
;;
|
||||
pdp11)
|
||||
basic_machine=pdp11-dec
|
||||
;;
|
||||
we32k)
|
||||
basic_machine=we32k-att
|
||||
;;
|
||||
sparc | sparcv9)
|
||||
sh3 | sh4 | sh3eb | sh4eb)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sparc | sparcv9 | sparcv9b)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
@@ -849,6 +1003,9 @@ case $basic_machine in
|
||||
basic_machine=c4x-none
|
||||
os=-coff
|
||||
;;
|
||||
*-unknown)
|
||||
# Make sure to match an already-canonicalized machine name.
|
||||
;;
|
||||
*)
|
||||
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
||||
exit 1
|
||||
@@ -905,14 +1062,30 @@ case $os in
|
||||
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
|
||||
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
case $basic_machine in
|
||||
x86-* | i*86-*)
|
||||
;;
|
||||
*)
|
||||
os=-nto$os
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-nto*)
|
||||
os=-nto-qnx
|
||||
;;
|
||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
|
||||
| -macos* | -mpw* | -magic* | -mon960* | -lnews*)
|
||||
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
|
||||
;;
|
||||
-mac*)
|
||||
os=`echo $os | sed -e 's|mac|macos|'`
|
||||
@@ -926,6 +1099,12 @@ case $os in
|
||||
-sunos6*)
|
||||
os=`echo $os | sed -e 's|sunos6|solaris3|'`
|
||||
;;
|
||||
-opened*)
|
||||
os=-openedition
|
||||
;;
|
||||
-wince*)
|
||||
os=-wince
|
||||
;;
|
||||
-osfrose*)
|
||||
os=-osfrose
|
||||
;;
|
||||
@@ -950,6 +1129,9 @@ case $os in
|
||||
-ns2 )
|
||||
os=-nextstep2
|
||||
;;
|
||||
-nsk*)
|
||||
os=-nsk
|
||||
;;
|
||||
# Preserve the version number of sinix5.
|
||||
-sinix5.*)
|
||||
os=`echo $os | sed -e 's|sinix|sysv|'`
|
||||
@@ -984,7 +1166,7 @@ case $os in
|
||||
-xenix)
|
||||
os=-xenix
|
||||
;;
|
||||
-*mint | -*MiNT)
|
||||
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
|
||||
os=-mint
|
||||
;;
|
||||
-none)
|
||||
@@ -1012,12 +1194,15 @@ case $basic_machine in
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
arm*-corel)
|
||||
arm*-rebel)
|
||||
os=-linux
|
||||
;;
|
||||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
;;
|
||||
pdp11-*)
|
||||
os=-none
|
||||
;;
|
||||
@@ -1126,7 +1311,7 @@ case $basic_machine in
|
||||
*-masscomp)
|
||||
os=-rtu
|
||||
;;
|
||||
f301-fujitsu)
|
||||
f30[01]-fujitsu | f700-fujitsu)
|
||||
os=-uxpv
|
||||
;;
|
||||
*-rom68k)
|
||||
@@ -1186,7 +1371,7 @@ case $basic_machine in
|
||||
-genix*)
|
||||
vendor=ns
|
||||
;;
|
||||
-mvs*)
|
||||
-mvs* | -opened*)
|
||||
vendor=ibm
|
||||
;;
|
||||
-ptx*)
|
||||
@@ -1204,12 +1389,23 @@ case $basic_machine in
|
||||
-mpw* | -macos*)
|
||||
vendor=apple
|
||||
;;
|
||||
-*mint | -*MiNT)
|
||||
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
|
||||
vendor=atari
|
||||
;;
|
||||
-vos*)
|
||||
vendor=stratus
|
||||
;;
|
||||
esac
|
||||
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
|
||||
;;
|
||||
esac
|
||||
|
||||
echo $basic_machine$os
|
||||
exit 0
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "timestamp='"
|
||||
# time-stamp-format: "%:y-%02m-%02d"
|
||||
# time-stamp-end: "'"
|
||||
# End:
|
||||
|
||||
2221
configure.in
2221
configure.in
File diff suppressed because it is too large
Load Diff
@@ -3,11 +3,11 @@
|
||||
#
|
||||
|
||||
all:
|
||||
cd src; make
|
||||
cd src; $(MAKE)
|
||||
|
||||
clean:
|
||||
cd src; make clean
|
||||
cd samples; make clean
|
||||
cd src; $(MAKE) clean
|
||||
cd samples; $(MAKE) clean
|
||||
|
||||
samples:
|
||||
cd samples; make
|
||||
cd samples; $(MAKE)
|
||||
|
||||
235
contrib/samples/mmedia/MMboardVC.dsp
Normal file
235
contrib/samples/mmedia/MMboardVC.dsp
Normal file
@@ -0,0 +1,235 @@
|
||||
# Microsoft Developer Studio Project File - Name="MMboardVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=MMboardVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "MMboardVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "MMboardVC.mak" CFG="MMboardVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "MMboardVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "MMboardVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "MMboardVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "MMboardVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "MMboardVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "MMboardVC - Win32 Release"
|
||||
# Name "MMboardVC - Win32 Debug"
|
||||
# Name "MMboardVC - Win32 Debug DLL"
|
||||
# Name "MMboardVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mmboard.cpp
|
||||
|
||||
!IF "$(CFG)" == "MMboardVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mmboard.h
|
||||
|
||||
!IF "$(CFG)" == "MMboardVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mmbman.cpp
|
||||
|
||||
!IF "$(CFG)" == "MMboardVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mmbman.h
|
||||
|
||||
!IF "$(CFG)" == "MMboardVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "MMboardVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mmboard.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
contrib/samples/mmedia/MMboardVC.dsw
Normal file
29
contrib/samples/mmedia/MMboardVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "MMboardVC"=.\MMboardVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
315
contrib/samples/ogl/ogledit/OGLEditVC.dsp
Normal file
315
contrib/samples/ogl/ogledit/OGLEditVC.dsp
Normal file
@@ -0,0 +1,315 @@
|
||||
# Microsoft Developer Studio Project File - Name="OGLEditVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=OGLEditVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "OGLEditVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "OGLEditVC.mak" CFG="OGLEditVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "OGLEditVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "OGLEditVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "OGLEditVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "OGLEditVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "OGLEditVC - Win32 Release"
|
||||
# Name "OGLEditVC - Win32 Debug"
|
||||
# Name "OGLEditVC - Win32 Debug DLL"
|
||||
# Name "OGLEditVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ogledit.cpp
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.cpp
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\palette.cpp
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.cpp
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.h
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ogledit.h
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\palette.h
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.h
|
||||
|
||||
!IF "$(CFG)" == "OGLEditVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "OGLEditVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ogledit.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
contrib/samples/ogl/ogledit/OGLEditVC.dsw
Normal file
29
contrib/samples/ogl/ogledit/OGLEditVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "OGLEditVC"=.\OGLEditVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -292,7 +292,7 @@ void MyCanvas::OnLeftClick(double x, double y, int keys)
|
||||
}
|
||||
if (info)
|
||||
{
|
||||
view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
|
||||
view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand((char*) info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
|
||||
x, y));
|
||||
}
|
||||
}
|
||||
|
||||
391
contrib/samples/ogl/studio/StudioVC.dsp
Normal file
391
contrib/samples/ogl/studio/StudioVC.dsp
Normal file
@@ -0,0 +1,391 @@
|
||||
# Microsoft Developer Studio Project File - Name="StudioVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=StudioVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "StudioVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "StudioVC.mak" CFG="StudioVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "StudioVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StudioVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "StudioVC - Win32 Release"
|
||||
# Name "StudioVC - Win32 Debug"
|
||||
# Name "StudioVC - Win32 Debug DLL"
|
||||
# Name "StudioVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cspalette.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cspalette.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\csprint.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dialogs.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dialogs.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mainfrm.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mainfrm.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\project.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\project.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\shapes.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\shapes.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\studio.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\symbols.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\symbols.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.cpp
|
||||
|
||||
!IF "$(CFG)" == "StudioVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StudioVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\view.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
contrib/samples/ogl/studio/StudioVC.dsw
Normal file
29
contrib/samples/ogl/studio/StudioVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "StudioVC"=.\StudioVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
175
contrib/samples/stc/StcTestVC.dsp
Normal file
175
contrib/samples/stc/StcTestVC.dsp
Normal file
@@ -0,0 +1,175 @@
|
||||
# Microsoft Developer Studio Project File - Name="StcTestVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=StcTestVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "StcTestVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "StcTestVC.mak" CFG="StcTestVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "StcTestVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StcTestVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StcTestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "StcTestVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "StcTestVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "StcTestVC - Win32 Release"
|
||||
# Name "StcTestVC - Win32 Debug"
|
||||
# Name "StcTestVC - Win32 Debug DLL"
|
||||
# Name "StcTestVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\stctest.cpp
|
||||
|
||||
!IF "$(CFG)" == "StcTestVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "StcTestVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\stctest.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
contrib/samples/stc/StcTestVC.dsw
Normal file
29
contrib/samples/stc/StcTestVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "StcTestVC"=.\StcTestVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -165,7 +165,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
ed->EmptyUndoBuffer();
|
||||
|
||||
ed->SetLexer(wxSTC_LEX_CPP);
|
||||
ed->SetKeywords(0,
|
||||
ed->SetKeyWords(0,
|
||||
"asm auto bool break case catch char class const "
|
||||
"const_cast continue default delete do double "
|
||||
"dynamic_cast else enum explicit export extern "
|
||||
|
||||
@@ -312,8 +312,14 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
|
||||
|
||||
delete frmt;
|
||||
}
|
||||
|
||||
|
||||
#ifdef wxSIZE_T_IS_ULONG
|
||||
// FIXME: we still need this horrible cast until wxDataOutputStream
|
||||
// is made 64 bit friendly.
|
||||
data << (unsigned int)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
|
||||
#else
|
||||
data << (fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
|
||||
#endif
|
||||
|
||||
// We, finally, copy the header block to the output stream
|
||||
{
|
||||
|
||||
@@ -18,8 +18,10 @@
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK__
|
||||
// Pizza !
|
||||
#include <wx/gtk/win_gtk.h>
|
||||
#endif
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
|
||||
@@ -489,13 +489,16 @@ void ScintillaWX::DoDragLeave() {
|
||||
// Redraw all of text area. This paint will not be abandoned.
|
||||
void ScintillaWX::FullPaint() {
|
||||
paintState = painting;
|
||||
// rcPaint = GetTextRectangle();
|
||||
// wxClientDC dc(wMain.GetID());
|
||||
// Surface surfaceWindow;
|
||||
// surfaceWindow.Init(&dc);
|
||||
// Paint(&surfaceWindow, rcPaint);
|
||||
// surfaceWindow.Release();
|
||||
wMain.GetID()->Refresh(FALSE);
|
||||
rcPaint = GetTextRectangle();
|
||||
paintingAllText = true;
|
||||
wxClientDC dc(wMain.GetID());
|
||||
Surface surfaceWindow;
|
||||
surfaceWindow.Init(&dc);
|
||||
Paint(&surfaceWindow, rcPaint);
|
||||
surfaceWindow.Release();
|
||||
|
||||
// wMain.GetID()->Refresh(FALSE);
|
||||
|
||||
paintState = notPainting;
|
||||
}
|
||||
|
||||
|
||||
@@ -338,7 +338,7 @@ methodOverrideMap = {
|
||||
|
||||
'''wxString %s() {
|
||||
wxString text;
|
||||
int len = GetTextLength();
|
||||
int len = GetTextLength()+1;
|
||||
char* buff = text.GetWriteBuf(len+1);
|
||||
|
||||
SendMsg(%s, len, (long)buff);
|
||||
|
||||
@@ -196,7 +196,7 @@ int Editor::MaxScrollPos() {
|
||||
return retVal;
|
||||
}
|
||||
|
||||
static inline bool IsControlCharacter(char ch) {
|
||||
static inline bool IsControlCharacter(signed char ch) {
|
||||
// iscntrl returns true for lots of chars > 127 which are displayable
|
||||
return ch >= 0 && ch < ' ';
|
||||
}
|
||||
|
||||
@@ -1055,7 +1055,7 @@ void wxStyledTextCtrl::SetText(const wxString& text) {
|
||||
// Retrieve all the text in the document.
|
||||
wxString wxStyledTextCtrl::GetText() {
|
||||
wxString text;
|
||||
int len = GetTextLength();
|
||||
int len = GetTextLength()+1;
|
||||
char* buff = text.GetWriteBuf(len+1);
|
||||
|
||||
SendMsg(2182, len, (long)buff);
|
||||
|
||||
19
debian/README.Debian
vendored
19
debian/README.Debian
vendored
@@ -24,5 +24,24 @@ wxwin-examples wxWindows and wxPython demos and samples (source)
|
||||
wxwin-i18n message catalogs for native language support
|
||||
|
||||
|
||||
The following three can be built from the source package
|
||||
with the mingw32 cross compiler, but are not currently
|
||||
distributed by Debian. If you feel that should change,
|
||||
please file a bug against the wxwindows2.2 package, or
|
||||
append your views to a report already there if you're not
|
||||
the first to do so.
|
||||
|
||||
[ you can check the current state of affairs at:
|
||||
http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]
|
||||
|
||||
Oh and, please do *not* file bug reports for these three
|
||||
to the Debian bts. But do feel free to email be personally
|
||||
if you find problems and/or have patches to fix them.
|
||||
|
||||
libwxmsw2.2-dev_2.2.8_i386.deb mingw32-cross wxMSW libs.
|
||||
libwxbase-msw2.2-dev_2.2.8_i386.deb mingw32-cross wxBase libs.
|
||||
wxwin2.2-headers-msw_2.2.8_i386.deb extra headers needed for wxMSW.
|
||||
|
||||
|
||||
-- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
|
||||
|
||||
|
||||
103
debian/changelog
vendored
103
debian/changelog
vendored
@@ -1,3 +1,106 @@
|
||||
wxwindows2.2 (2.2.9) unstable; urgency=high
|
||||
|
||||
* fix for arches with unsigned char as default.
|
||||
* high urgency because this fix really should get
|
||||
into woody.
|
||||
Closes: #127014
|
||||
|
||||
-- Ron Lee <ron@debian.org> Mon, 31 Dec 2001 06:53:27 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8.5) unstable; urgency=low
|
||||
|
||||
* Add wxSIZE_T_IS defines to setup.h
|
||||
Add automate that to my TODO list.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Tue, 27 Nov 2001 05:55:47 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8.4) unstable; urgency=low
|
||||
|
||||
* Put the (modified) size_t == ulong kludge back into sndwav.cpp
|
||||
it's still needed until wxDataOutputStream is made 64 bit
|
||||
friendly, which may not happen for 2.2 since it will probably
|
||||
not be binary compatible.
|
||||
* caps a memory leak in the jpeg handler.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sun, 25 Nov 2001 11:53:59 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8.3) unstable; urgency=low
|
||||
|
||||
* Backported size_t test from 2.3 tree, removes the need for
|
||||
specific tests for various 64 bit platforms including now
|
||||
S/390 (thanks to Gerhard Tonn for the report).
|
||||
Closes: #120768
|
||||
|
||||
-- Ron Lee <ron@debian.org> Fri, 23 Nov 2001 20:53:49 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8.2) unstable; urgency=low
|
||||
|
||||
* python-dev doesn't get me python? More bytes in Build-Dep then
|
||||
I guess ... Closes: #119954
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sun, 18 Nov 2001 04:28:41 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8.1) unstable; urgency=low
|
||||
|
||||
* Rebuild for python2.1 Closes: #119226, #118835
|
||||
|
||||
-- Ron Lee <ron@debian.org> Mon, 12 Nov 2001 21:47:38 -0800
|
||||
|
||||
wxwindows2.2 (2.2.8) unstable; urgency=medium
|
||||
|
||||
* Fixed bogus samples makefile. Closes: #110061
|
||||
* Added ability to build wxMSW-cross packages, but they
|
||||
are not built and distributed by default.
|
||||
|
||||
If you think such creatures belong in the archive,
|
||||
see README.Debian
|
||||
|
||||
* Pruned more inapplicable files from the raw cvs source,
|
||||
cleaned configure.in and removed the need for a common setup.h,
|
||||
removed superfluous library links and generally tweaked things
|
||||
so as to make adding new ports easier.
|
||||
* added --gl-libs flag to wx-config.
|
||||
* added wx2.4 forward compatible event macros.
|
||||
* added build fixes for IA64 from Jeff Licquia, and fixed clean
|
||||
rules to pick up unnoticed strays that effected NMU builds.
|
||||
Thanks Jeff. Closes: #101734, #104679 (fixed in NMU)
|
||||
* Medium urgency since several other packages are waiting
|
||||
for this to get into testing.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Thu, 30 Aug 2001 15:41:49 -0700
|
||||
|
||||
wxwindows2.2 (2.2.7) unstable; urgency=medium
|
||||
|
||||
* The "Testing Tarantella" release.
|
||||
* various small control (mis)behaviours corrected.
|
||||
* added missing build-dep for gettext.
|
||||
* updated wxPython description, Closes: #102689
|
||||
* Never publicly released, oh well.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sun, 10 Jun 2001 19:32:46 -0700
|
||||
|
||||
wxwindows2.2 (2.2.6.1) unstable; urgency=low
|
||||
|
||||
* fix rules so it really doesn't build -indep for ports
|
||||
and fixed ambiguous overload bug in mmedia contrib.
|
||||
This time it will build on alpha for sure. Really. :)
|
||||
Closes: #92288
|
||||
* added extra -dev package deps. Closes: #91364
|
||||
|
||||
-- Ron Lee <ron@debian.org> Sat, 7 Apr 2001 06:49:58 -0700
|
||||
|
||||
wxwindows2.2 (2.2.6) unstable; urgency=low
|
||||
|
||||
* changed i18n package back to building during arch phase
|
||||
so we can reap the .mo files as they are created. Closes: #86174
|
||||
* OBCBLR Closes: #84692
|
||||
* fix wxPython build gremlin. Closes: #89209, #85129
|
||||
* tweaked wx-config alternatives priority to favour the most
|
||||
likely default use.
|
||||
* general buglet count reduced.
|
||||
|
||||
-- Ron Lee <ron@debian.org> Thu, 8 Mar 2001 21:10:07 -0800
|
||||
|
||||
wxwindows2.2 (2.2.5.1) unstable; urgency=low
|
||||
|
||||
* "This One's for Dirk" Closes: #84696
|
||||
|
||||
46
debian/control.in
vendored
46
debian/control.in
vendored
@@ -1,9 +1,9 @@
|
||||
Source: wxwindows=V
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>=2.0), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
|
||||
Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.1), python (<<2.2), python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
|
||||
Maintainer: Ron Lee <ron@debian.org>
|
||||
Standards-Version: 3.2.1.2
|
||||
Standards-Version: 3.5.6.0
|
||||
|
||||
Package: libwxbase=V
|
||||
Architecture: any
|
||||
@@ -25,7 +25,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
|
||||
Package: libwxbase=V-dev
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), zlib1g-dev, libc6-dev
|
||||
Suggests: wxwin=V-doc, gettext
|
||||
Conflicts: libwxbase-dev
|
||||
Replaces: libwxbase-dev
|
||||
@@ -44,6 +44,7 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows
|
||||
Package: libwxbase=V-dbg
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Priority: extra
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
|
||||
Conflicts: libwxbase-dbg
|
||||
Replaces: libwxbase-dbg
|
||||
@@ -80,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
|
||||
Package: libwxgtk=V-dev
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev
|
||||
Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
|
||||
Conflicts: libwxgtk-dev
|
||||
Replaces: libwxgtk-dev, wxgtk2.1-dev
|
||||
@@ -97,6 +98,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
|
||||
Package: libwxgtk=V-dbg
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Priority: extra
|
||||
Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
|
||||
Conflicts: libwxgtk-dbg
|
||||
Replaces: libwxgtk-dbg
|
||||
@@ -114,11 +116,11 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
|
||||
Package: libwxgtk=V-python
|
||||
Architecture: any
|
||||
Section: interpreters
|
||||
Depends: libwxgtk=V (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends}
|
||||
Suggests: wxwin=V-doc
|
||||
Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends}
|
||||
Suggests: wxwin=V-doc, wxwin=V-examples
|
||||
Conflicts: libwxgtk=V-python-contrib, python-wxwin
|
||||
Replaces: libwxgtk=V-python-contrib, python-wxwin
|
||||
Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
|
||||
Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
|
||||
wxWindows is a class library for C++ providing GUI (Graphical User
|
||||
Interface) and other facilities on more than one platform. Version =V
|
||||
currently supports subsets of GTK+, Motif, and MS Windows.
|
||||
@@ -202,3 +204,33 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
|
||||
.
|
||||
This package contains examples of using the wxWindows toolkit.
|
||||
|
||||
Package: libwxbase-msw=V-dev
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers-msw (= ${Source-Version})
|
||||
Conflicts: libwxbase-msw-dev
|
||||
Replaces: libwxbase-msw-dev
|
||||
Provides: libwxbase-msw-dev
|
||||
Description: wxBase mingw32msvc-cross
|
||||
mingw32msvc-cross wxBase libs.
|
||||
|
||||
Package: libwxmsw=V-dev
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers-msw (= ${Source-Version})
|
||||
Conflicts: libwxmsw-dev
|
||||
Replaces: libwxmsw-dev
|
||||
Provides: libwxmsw-dev
|
||||
Description: wxMSW mingw32msvc-cross
|
||||
mingw32msvc-cross wxMSW libs.
|
||||
|
||||
Package: wxwin=V-headers-msw
|
||||
Architecture: i386
|
||||
Section: otherosfs
|
||||
Depends: wxwin=V-headers (= ${Source-Version})
|
||||
Conflicts: wxwin-headers-msw
|
||||
Replaces: wxwin-headers-msw
|
||||
Provides: wxwin-headers-msw
|
||||
Description: Extra wxWindows headers for mingw32msvc-cross
|
||||
Headers required by the wxWindows mingw32msvc-cross libraries.
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.dirs
vendored
2
debian/libwxbase-dbg.dirs
vendored
@@ -1,5 +1,5 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx
|
||||
usr/lib/wx/include/based-=V/wx
|
||||
usr/share/man/man1
|
||||
usr/share/lintian/overrides
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.links
vendored
2
debian/libwxbase-dbg.links
vendored
@@ -1,2 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxbase-dbg.postinst
vendored
2
debian/libwxbase-dbg.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
ldconfig
|
||||
|
||||
2
debian/libwxbase-dbg.prerm
vendored
2
debian/libwxbase-dbg.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbased-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.dirs
vendored
2
debian/libwxbase-dev.dirs
vendored
@@ -1,3 +1,3 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx
|
||||
usr/lib/wx/include/base-=V/wx
|
||||
usr/share/man/man1
|
||||
|
||||
4
debian/libwxbase-dev.files
vendored
4
debian/libwxbase-dev.files
vendored
@@ -1,4 +1,4 @@
|
||||
usr/bin/wxbase-config
|
||||
usr/lib/wx/include/wx/base/setup.h
|
||||
usr/bin/wxbase-=V-config
|
||||
usr/lib/wx/include/base-=V/wx/setup.h
|
||||
usr/lib/libwx_base*.so
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.links
vendored
2
debian/libwxbase-dev.links
vendored
@@ -1 +1 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz
|
||||
|
||||
2
debian/libwxbase-dev.postinst
vendored
2
debian/libwxbase-dev.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxbase-dev.prerm
vendored
2
debian/libwxbase-dev.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
4
debian/libwxbase-msw-dev.dirs
vendored
Normal file
4
debian/libwxbase-msw-dev.dirs
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
usr/bin
|
||||
usr/=H/lib/wx/include/base-=V-=H/wx
|
||||
usr/share/man/man1
|
||||
|
||||
2
debian/libwxbase-msw-dev.links
vendored
Normal file
2
debian/libwxbase-msw-dev.links
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
|
||||
|
||||
7
debian/libwxbase-msw-dev.postinst
vendored
Normal file
7
debian/libwxbase-msw-dev.postinst
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
7
debian/libwxbase-msw-dev.prerm
vendored
Normal file
7
debian/libwxbase-msw-dev.prerm
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
2
debian/libwxgtk-dbg.dirs
vendored
2
debian/libwxgtk-dbg.dirs
vendored
@@ -1,5 +1,5 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx/gtkd/
|
||||
usr/lib/wx/include/gtkd-=V/wx
|
||||
usr/share/man/man1
|
||||
usr/share/lintian/overrides
|
||||
|
||||
|
||||
2
debian/libwxgtk-dbg.links
vendored
2
debian/libwxgtk-dbg.links
vendored
@@ -1,2 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxgtk-dbg.postinst
vendored
2
debian/libwxgtk-dbg.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
ldconfig
|
||||
|
||||
2
debian/libwxgtk-dbg.prerm
vendored
2
debian/libwxgtk-dbg.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtkd-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
3
debian/libwxgtk-dev.dirs
vendored
3
debian/libwxgtk-dev.dirs
vendored
@@ -1,3 +1,4 @@
|
||||
usr/bin
|
||||
usr/lib/wx/include/wx/gtk/
|
||||
usr/lib/wx/include/gtk-=V/wx
|
||||
usr/share/man/man1
|
||||
|
||||
|
||||
8
debian/libwxgtk-dev.files
vendored
8
debian/libwxgtk-dev.files
vendored
@@ -1,6 +1,4 @@
|
||||
usr/bin/wxgtk-config
|
||||
usr/lib/wx/include/wx/gtk/setup.h
|
||||
usr/lib/libwx_gtk-*.so
|
||||
usr/lib/libwx_gtk.so
|
||||
usr/lib/libwx_gtk_gl*.so
|
||||
usr/bin/wxgtk-=V-config
|
||||
usr/lib/wx/include/gtk-=V/wx/setup.h
|
||||
usr/lib/libwx_gtk*.so
|
||||
|
||||
|
||||
3
debian/libwxgtk-dev.links
vendored
3
debian/libwxgtk-dev.links
vendored
@@ -1 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz
|
||||
|
||||
|
||||
2
debian/libwxgtk-dev.postinst
vendored
2
debian/libwxgtk-dev.postinst
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 50
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
2
debian/libwxgtk-dev.prerm
vendored
2
debian/libwxgtk-dev.prerm
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtk-config
|
||||
update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
|
||||
4
debian/libwxmsw-dev.dirs
vendored
Normal file
4
debian/libwxmsw-dev.dirs
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
usr/bin
|
||||
usr/=H/lib/wx/include/msw-=V-=H/wx
|
||||
usr/share/man/man1
|
||||
|
||||
2
debian/libwxmsw-dev.links
vendored
Normal file
2
debian/libwxmsw-dev.links
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz
|
||||
|
||||
7
debian/libwxmsw-dev.postinst
vendored
Normal file
7
debian/libwxmsw-dev.postinst
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
7
debian/libwxmsw-dev.prerm
vendored
Normal file
7
debian/libwxmsw-dev.prerm
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
|
||||
update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
239
debian/rules
vendored
239
debian/rules
vendored
@@ -13,6 +13,9 @@ export DH_OPTIONS
|
||||
release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
|
||||
python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
|
||||
|
||||
cross_host=i586-mingw32msvc
|
||||
cross_build=$(shell ./config.guess)
|
||||
|
||||
# Packages to build:
|
||||
package_wxbase_lib=libwxbase$(release)
|
||||
package_wxbase_dev=libwxbase$(release)-dev
|
||||
@@ -28,6 +31,10 @@ package_i18n=wxwin$(release)-i18n
|
||||
package_doc=wxwin$(release)-doc
|
||||
package_examples=wxwin$(release)-examples
|
||||
|
||||
package_wxbase_msw_dev=libwxbase-msw$(release)-dev
|
||||
package_msw_dev=libwxmsw$(release)-dev
|
||||
package_headers_msw=wxwin$(release)-headers-msw
|
||||
|
||||
# Build directories:
|
||||
objdir_wxbase_shared=objs_wxbase_sh
|
||||
objdir_wxbase_static=objs_wxbase_st
|
||||
@@ -39,30 +46,52 @@ objdir_doc_cruft=objs_doc_con
|
||||
objdir_doc=docs/wxWindows-manual.html
|
||||
objdir_examples=docs/examples
|
||||
objdir_i18n=locale
|
||||
|
||||
objdir_wxbase_msw_static=objs_wxbase_msw_st
|
||||
objdir_msw_static=objs_msw_st
|
||||
|
||||
objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
|
||||
$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
|
||||
$(objdir_doc) $(objdir_examples)
|
||||
$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
|
||||
$(objdir_wxbase_msw_static) $(objdir_msw_static)
|
||||
|
||||
# note that the i18n package is actually arch indep (once built)
|
||||
# but must be built (and installed) during the arch any phase as
|
||||
# it's pulled out of the wxGtk shared lib package.
|
||||
|
||||
# Build stamps:
|
||||
build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
|
||||
build-wxbase-debug-stamp build-gtk-shared-stamp \
|
||||
build-gtk-static-stamp build-gtk-debug-stamp \
|
||||
build-contrib-shared-stamp build-contrib-static-stamp \
|
||||
build-gtk-py-stamp
|
||||
build-gtk-py-stamp build-i18n-stamp
|
||||
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp build-i18n-stamp
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp
|
||||
|
||||
build_stamps=$(build_arch_stamps) $(build_indep_stamps)
|
||||
build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
|
||||
|
||||
build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
|
||||
|
||||
build_stamps=$(build_stamps_native) $(build_cross_stamps)
|
||||
|
||||
# Install targets:
|
||||
install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
|
||||
install-gtk-lib install-gtk-dev install-gtk-dbg \
|
||||
install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
|
||||
install-headers
|
||||
install-headers install-i18n
|
||||
|
||||
install_all_indep=install-i18n install-doc install-examples
|
||||
install_all_indep=install-examples install-doc
|
||||
|
||||
install_all=$(install_all_arch) $(install_all_indep)
|
||||
install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
|
||||
|
||||
install_all_native=$(install_all_arch) $(install_all_indep)
|
||||
|
||||
install_all=$(install_all_native) $(install_all_cross)
|
||||
|
||||
|
||||
wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
|
||||
--prefix=$(shell pwd) \
|
||||
--exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
|
||||
|
||||
|
||||
# The Rules:
|
||||
@@ -70,10 +99,7 @@ install_all=$(install_all_arch) $(install_all_indep)
|
||||
debian/control: debian/control.in
|
||||
sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
|
||||
|
||||
debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
|
||||
sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
|
||||
|
||||
control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
control-files-stamp: debian/control
|
||||
dh_testdir
|
||||
@for f in dirs postinst; do \
|
||||
echo "generating control file $(package_wxbase_lib).$$f"; \
|
||||
@@ -81,11 +107,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs files links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_dev).$$f"; \
|
||||
cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
|
||||
> debian/$(package_wxbase_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_dbg).$$f"; \
|
||||
cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
|
||||
> debian/$(package_wxbase_dbg).$$f; \
|
||||
done;
|
||||
@for f in dirs postinst; do \
|
||||
echo "generating control file $(package_gtk_lib).$$f"; \
|
||||
@@ -93,11 +121,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs files links postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_dev).$$f"; \
|
||||
cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
|
||||
> debian/$(package_gtk_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_dbg).$$f"; \
|
||||
cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
|
||||
> debian/$(package_gtk_dbg).$$f; \
|
||||
done;
|
||||
@for f in dirs docs files postinst prerm; do \
|
||||
echo "generating control file $(package_gtk_py).$$f"; \
|
||||
@@ -122,17 +152,41 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
|
||||
done;
|
||||
@for f in dirs docs doc-base; do \
|
||||
echo "generating control file $(package_doc).$$f"; \
|
||||
cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
|
||||
sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
|
||||
> debian/$(package_doc).$$f; \
|
||||
done;
|
||||
@for f in examples; do \
|
||||
echo "generating control file $(package_examples).$$f"; \
|
||||
cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_wxbase_msw_dev).$$f"; \
|
||||
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
|
||||
> debian/$(package_wxbase_msw_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs links postinst prerm; do \
|
||||
echo "generating control file $(package_msw_dev).$$f"; \
|
||||
sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
|
||||
> debian/$(package_msw_dev).$$f; \
|
||||
done;
|
||||
@for f in dirs; do \
|
||||
echo "generating control file $(package_headers_msw).$$f"; \
|
||||
sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
|
||||
> debian/$(package_headers_msw).$$f; \
|
||||
done;
|
||||
touch $@
|
||||
|
||||
build_arch: control-files-stamp $(build_arch_stamps)
|
||||
build_all: control-files-stamp $(build_stamps_native)
|
||||
|
||||
# Really we should probably do nothing here until we know which
|
||||
# binary target is being called, but alpha builds were exploding
|
||||
# (compiler segfaults) in random places when building under fakeroot
|
||||
# from the binary-arch target. Build all -arch files here then, and
|
||||
# let the -indep stuff fend for itself later.
|
||||
|
||||
build: build_arch
|
||||
|
||||
build: control-files-stamp $(build_stamps)
|
||||
|
||||
build-wxbase-shared-stamp:
|
||||
dh_testdir
|
||||
@@ -141,7 +195,7 @@ build-wxbase-shared-stamp:
|
||||
&& ../configure --prefix=/usr \
|
||||
--cache-file=../config_deb.cache \
|
||||
--disable-gui \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
@@ -166,7 +220,7 @@ build-wxbase-debug-stamp:
|
||||
--cache-file=../config_deb.cache \
|
||||
--disable-gui \
|
||||
--enable-debug \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
@@ -179,7 +233,7 @@ build-gtk-shared-stamp:
|
||||
--cache-file=../config_deb.cache \
|
||||
--with-gtk \
|
||||
--with-opengl \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
--with-libjpeg=sys \
|
||||
--with-libpng=sys \
|
||||
@@ -212,7 +266,7 @@ build-gtk-debug-stamp:
|
||||
--with-gtk \
|
||||
--with-opengl \
|
||||
--enable-debug \
|
||||
--enable-burnt_name \
|
||||
--enable-soname \
|
||||
--with-zlib=sys \
|
||||
--with-libjpeg=sys \
|
||||
--with-libpng=sys \
|
||||
@@ -236,7 +290,7 @@ build-gtk-py-stamp: build-gtk-shared-stamp
|
||||
dh_testdir
|
||||
touch docs/lgpl.txt
|
||||
cd wxPython \
|
||||
&& ./setup.py build IN_CVS_TREE=1
|
||||
&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
|
||||
touch $@
|
||||
|
||||
build-doc-stamp: build-gtk-shared-stamp
|
||||
@@ -246,7 +300,7 @@ build-doc-stamp: build-gtk-shared-stamp
|
||||
mkdir $(objdir_doc)
|
||||
mkdir $(objdir_doc_cruft)
|
||||
cd $(objdir_doc_cruft) \
|
||||
&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
|
||||
&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
|
||||
../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
|
||||
../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
|
||||
cp docs/latex/wx/*.gif $(objdir_doc)
|
||||
@@ -255,10 +309,15 @@ build-doc-stamp: build-gtk-shared-stamp
|
||||
$(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
|
||||
touch $@
|
||||
|
||||
build-examples-stamp:
|
||||
build-examples-stamp: build-gtk-shared-stamp
|
||||
dh_testdir
|
||||
mkdir $(objdir_examples)
|
||||
|
||||
# copy all samples and the Makefile generated for libwxgtk.
|
||||
cp -a samples $(objdir_examples)
|
||||
rm -f $(objdir_examples)/samples/Makefile
|
||||
cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
|
||||
|
||||
cp -a demos $(objdir_examples)
|
||||
cp -a wxPython/demo $(objdir_examples)/wxPython
|
||||
@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
|
||||
@@ -276,16 +335,59 @@ build-examples-stamp:
|
||||
|
||||
build-i18n-stamp: build-gtk-shared-stamp
|
||||
dh_testdir
|
||||
|
||||
# touch .po files first, since if they are not already up
|
||||
# to date then _now_ is not the time to fix it.
|
||||
# That should have been been done before cvs was tagged.
|
||||
cd $(objdir_i18n) \
|
||||
&& touch *.po \
|
||||
&& $(MAKE) allmo
|
||||
touch $@
|
||||
|
||||
build-wxbase-msw-dev-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_wxbase_msw_static)
|
||||
cd $(objdir_wxbase_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=../config_deb.cache \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--disable-gui \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-msw-dev-stamp:
|
||||
dh_testdir
|
||||
mkdir $(objdir_msw_static)
|
||||
cd $(objdir_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=../config_deb.cache \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--with-mingw \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
|
||||
clean: debian/control
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
||||
rm -rf config_deb.cache control-files-stamp $(build_stamps) $(objdirs)
|
||||
rm -f docs/lgpl.txt
|
||||
cd wxPython && ./setup.py clean
|
||||
rm -f docs/latex/wx/manual.bb
|
||||
rm -f $(objdir_i18n)/*.mo
|
||||
|
||||
cd wxPython \
|
||||
&& ./setup.py clean \
|
||||
&& rm -rf licence \
|
||||
&& rm -rf build \
|
||||
&& rm -rf contrib/ogl/contrib \
|
||||
&& rm -rf contrib/stc/contrib \
|
||||
&& rm -rf *.pyc
|
||||
|
||||
dh_clean
|
||||
rm -f debian/$(package_wxbase_lib).*
|
||||
rm -f debian/$(package_wxbase_dev).*
|
||||
@@ -300,10 +402,13 @@ clean: debian/control
|
||||
rm -f debian/$(package_i18n).*
|
||||
rm -f debian/$(package_doc).*
|
||||
rm -f debian/$(package_examples).*
|
||||
rm -f debian/$(package_wxbase_msw_dev).*
|
||||
rm -f debian/$(package_msw_dev).*
|
||||
rm -f debian/$(package_headers_msw).*
|
||||
|
||||
install_arch: build_arch $(install_all_arch)
|
||||
|
||||
install: build $(install_all)
|
||||
install: build_all $(install_all_native)
|
||||
|
||||
install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
|
||||
install-wxbase-lib: build-wxbase-shared-stamp
|
||||
@@ -312,7 +417,7 @@ install-wxbase-lib: build-wxbase-shared-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
|
||||
cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/
|
||||
cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/
|
||||
|
||||
install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
|
||||
install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
|
||||
@@ -330,7 +435,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
|
||||
cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
|
||||
cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
|
||||
cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
|
||||
|
||||
install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
|
||||
@@ -359,7 +464,7 @@ install-gtk-dbg: build-gtk-debug-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
|
||||
cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
|
||||
cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
|
||||
cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
|
||||
|
||||
install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
|
||||
@@ -429,18 +534,60 @@ install-examples: build-examples-stamp
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
|
||||
install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
|
||||
install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
|
||||
install-msw-dev: build-msw-dev-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
|
||||
install-headers-msw:
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
@# Symlink all the headers that will be installed by the main -headers
|
||||
@# package to where the cross compiler will expect them.
|
||||
@for f in `ls -1 include/wx`; do \
|
||||
ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
|
||||
echo "linking header /usr/include/wx/$$f"; \
|
||||
done;
|
||||
@# But install this lot for real.
|
||||
rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
|
||||
cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
|
||||
@# and remove this cruft(?)
|
||||
rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
|
||||
|
||||
|
||||
binary-common:
|
||||
dh_testversion 2
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installdocs
|
||||
dh_installchangelogs
|
||||
dh_installexamples
|
||||
dh_link
|
||||
dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
|
||||
|
||||
@# Don't strip debug libs at all, and strip cross libs elsewhere
|
||||
@# with the cross host tools until dh_strip gets smarter.
|
||||
dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev)
|
||||
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_makeshlibs -N$(package_gtk_py)
|
||||
dh_makeshlibs -N$(package_gtk_py) -V
|
||||
dh_installdeb
|
||||
dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
|
||||
dh_gencontrol
|
||||
@@ -450,16 +597,30 @@ binary-common:
|
||||
# Build architecture-independent files here.
|
||||
# Note that you currently can't build the indep packages without first
|
||||
# building the arch specific package files needed to create them.
|
||||
binary-indep: build install
|
||||
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
|
||||
binary-indep: build_all install
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
# Build just the architecture-dependent files here.
|
||||
binary-arch: build_arch install_arch
|
||||
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
# Build all packages target.
|
||||
binary: binary-arch binary-indep
|
||||
|
||||
# This is a special target for building the wxMSW-cross packages.
|
||||
# It's not currently called during the official package build run
|
||||
# but may be run separately to build the extra packages.
|
||||
# There is an implied build dep on the mingw32 cross compiler
|
||||
# that is not in the control file.
|
||||
binary-cross: control-files-stamp $(install_all_cross)
|
||||
$(MAKE) -f debian/rules \
|
||||
DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \
|
||||
binary-common
|
||||
|
||||
|
||||
############################################################################
|
||||
#
|
||||
@@ -498,10 +659,12 @@ binary-doc: control-files-stamp install-doc
|
||||
$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
|
||||
|
||||
|
||||
.PHONY: build build_arch clean binary-indep binary-arch binary binary-common \
|
||||
.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
|
||||
binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
|
||||
binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
|
||||
binary-wxbase-dbg binary-doc binary-cross \
|
||||
install install_arch install-wxbase-lib \
|
||||
install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
|
||||
install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
|
||||
install-gtk-py install-headers install-i18n install-doc install-examples
|
||||
install-gtk-py install-headers install-i18n install-doc install-examples \
|
||||
install-wxbase-msw-dev install-msw-dev install-headers-msw
|
||||
|
||||
|
||||
16
debian/wx-config.1
vendored
16
debian/wx-config.1
vendored
@@ -8,7 +8,8 @@ wx-config - generate compile time info for wxWindows
|
||||
.B wxgtk-config
|
||||
.HP
|
||||
.B wx-config
|
||||
[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
|
||||
[\-\-version] [\-\-libs] [\-\-gl\-libs] [\-\-cppflags]
|
||||
[\-\-cflags] [\-\-cxxflags] [\-\-cc] [\-\-cxx] [\-\-ld]
|
||||
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
|
||||
.SH DESCRIPTION
|
||||
\fIwx-config\fP is a tool to determine the compiler and linker
|
||||
@@ -35,10 +36,19 @@ include in a bug report.
|
||||
( But of course you already knew that ... )
|
||||
.TP 8
|
||||
.B \-\-libs
|
||||
Generate linker flags for a \fIwxWindows\fP program.
|
||||
Output linker flags for a \fIwxWindows\fP program.
|
||||
.TP 8
|
||||
.B \-\-gl\-libs
|
||||
Output additional linker flags for apps using GLCanvas.
|
||||
.TP 8
|
||||
.B \-\-cppflags
|
||||
Output build\-time preprocessor flags.
|
||||
.TP 8
|
||||
.B \-\-cflags
|
||||
Generate compiler flags for the same.
|
||||
Output C compiler flags.
|
||||
.TP 8
|
||||
.B \-\-cxxflags
|
||||
Output C++ compiler flags.
|
||||
.TP 8
|
||||
.B \-\-cc
|
||||
Output the name of the C compiler \fB$(CC)\fP.
|
||||
|
||||
2
debian/wxwin-headers-msw.dirs
vendored
Normal file
2
debian/wxwin-headers-msw.dirs
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/=H/include/wx
|
||||
|
||||
223
demos/bombs/BombsVC.dsp
Normal file
223
demos/bombs/BombsVC.dsp
Normal file
@@ -0,0 +1,223 @@
|
||||
# Microsoft Developer Studio Project File - Name="BombsVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=BombsVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "BombsVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "BombsVC.mak" CFG="BombsVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "BombsVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "BombsVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "BombsVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "BombsVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "BombsVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/bombs.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/bombs.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/bombs.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/bombs.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "BombsVC - Win32 Release"
|
||||
# Name "BombsVC - Win32 Debug"
|
||||
# Name "BombsVC - Win32 Debug DLL"
|
||||
# Name "BombsVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\bombs.cpp
|
||||
|
||||
!IF "$(CFG)" == "BombsVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\bombs.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\bombs.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\bombs1.cpp
|
||||
|
||||
!IF "$(CFG)" == "BombsVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.cpp
|
||||
|
||||
!IF "$(CFG)" == "BombsVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "BombsVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/bombs/BombsVC.dsw
Normal file
29
demos/bombs/BombsVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "BombsVC"=.\BombsVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
351
demos/dbbrowse/DbbrowseVC.dsp
Normal file
351
demos/dbbrowse/DbbrowseVC.dsp
Normal file
@@ -0,0 +1,351 @@
|
||||
# Microsoft Developer Studio Project File - Name="DbbrowseVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=DbbrowseVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "DbbrowseVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "DbbrowseVC.mak" CFG="DbbrowseVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "DbbrowseVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "DbbrowseVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "DbbrowseVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "DbbrowseVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/dbbrowse.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/dbbrowse.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dbbrowse.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dbbrowse.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "DbbrowseVC - Win32 Release"
|
||||
# Name "DbbrowseVC - Win32 Debug"
|
||||
# Name "DbbrowseVC - Win32 Debug DLL"
|
||||
# Name "DbbrowseVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\browsedb.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\browsedb.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbbrowse.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbbrowse.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbbrowse.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbgrid.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbgrid.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbtree.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dbtree.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dlguser.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dlguser.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\doc.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pgmctrl.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pgmctrl.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\std.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\tabpgwin.cpp
|
||||
|
||||
!IF "$(CFG)" == "DbbrowseVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "DbbrowseVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\tabpgwin.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/dbbrowse/DbbrowseVC.dsw
Normal file
29
demos/dbbrowse/DbbrowseVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "DbbrowseVC"=.\DbbrowseVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -33,6 +33,11 @@
|
||||
// Global structure for holding ODBC connection information
|
||||
// - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
|
||||
wxDbConnectInf ConnectInf; // F<>r DBase
|
||||
|
||||
#if !wxUSE_ODBC
|
||||
#error Demo cannot be compiled unless setup.h has wxUSE_ODBC set to 1
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------------------
|
||||
extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList; /* from db.cpp, used in getting back error results from db connections */
|
||||
//----------------------------------------------------------------------------------------
|
||||
|
||||
347
demos/forty/FortyVC.dsp
Normal file
347
demos/forty/FortyVC.dsp
Normal file
@@ -0,0 +1,347 @@
|
||||
# Microsoft Developer Studio Project File - Name="FortyVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=FortyVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "FortyVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "FortyVC.mak" CFG="FortyVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "FortyVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FortyVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FortyVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FortyVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/forty.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/forty.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/forty.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/forty.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "FortyVC - Win32 Release"
|
||||
# Name "FortyVC - Win32 Debug"
|
||||
# Name "FortyVC - Win32 Debug DLL"
|
||||
# Name "FortyVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\canvas.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\canvas.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\card.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\card.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\forty.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\forty.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\forty.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pile.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\pile.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\playerdg.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\playerdg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\scoredg.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\scoredg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\scorefil.cpp
|
||||
|
||||
!IF "$(CFG)" == "FortyVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FortyVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\scorefil.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/forty/FortyVC.dsw
Normal file
29
demos/forty/FortyVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "FortyVC"=.\FortyVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
175
demos/fractal/FractalVC.dsp
Normal file
175
demos/fractal/FractalVC.dsp
Normal file
@@ -0,0 +1,175 @@
|
||||
# Microsoft Developer Studio Project File - Name="FractalVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=FractalVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "FractalVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "FractalVC.mak" CFG="FractalVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "FractalVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FractalVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FractalVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "FractalVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "FractalVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/fractal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/fractal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/fractal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/fractal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "FractalVC - Win32 Release"
|
||||
# Name "FractalVC - Win32 Debug"
|
||||
# Name "FractalVC - Win32 Debug DLL"
|
||||
# Name "FractalVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\fractal.cpp
|
||||
|
||||
!IF "$(CFG)" == "FractalVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "FractalVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\fractal.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/fractal/FractalVC.dsw
Normal file
29
demos/fractal/FractalVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 5.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "FractalVC"=.\FractalVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
235
demos/life/LifeVC.dsp
Normal file
235
demos/life/LifeVC.dsp
Normal file
@@ -0,0 +1,235 @@
|
||||
# Microsoft Developer Studio Project File - Name="LifeVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=LifeVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "LifeVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "LifeVC.mak" CFG="LifeVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "LifeVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "LifeVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "LifeVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "LifeVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "LifeVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/life.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/life.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/life.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/life.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "LifeVC - Win32 Release"
|
||||
# Name "LifeVC - Win32 Debug"
|
||||
# Name "LifeVC - Win32 Debug DLL"
|
||||
# Name "LifeVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dialogs.cpp
|
||||
|
||||
!IF "$(CFG)" == "LifeVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\dialogs.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.cpp
|
||||
|
||||
!IF "$(CFG)" == "LifeVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\game.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\life.cpp
|
||||
|
||||
!IF "$(CFG)" == "LifeVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "LifeVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\life.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\life.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\reader.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\reader.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/life/LifeVC.dsw
Normal file
29
demos/life/LifeVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "LifeVC"=.\LifeVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -286,16 +286,16 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
|
||||
|
||||
// info panel
|
||||
m_text = new wxStaticText(panel2, -1,
|
||||
wxEmptyString,
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxALIGN_CENTER | wxST_NO_AUTORESIZE);
|
||||
wxEmptyString,
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxALIGN_CENTER | wxST_NO_AUTORESIZE);
|
||||
|
||||
wxSlider *slider = new wxSlider(panel2, ID_SLIDER,
|
||||
5, 1, 10,
|
||||
wxDefaultPosition,
|
||||
wxSize(200, -1),
|
||||
wxSL_HORIZONTAL | wxSL_AUTOTICKS);
|
||||
5, 1, 10,
|
||||
wxDefaultPosition,
|
||||
wxSize(200, -1),
|
||||
wxSL_HORIZONTAL | wxSL_AUTOTICKS);
|
||||
|
||||
UpdateInfoText();
|
||||
|
||||
@@ -341,9 +341,9 @@ void LifeFrame::UpdateInfoText()
|
||||
wxString msg;
|
||||
|
||||
msg.Printf(_(" Generation: %u (T: %u ms), Population: %u "),
|
||||
m_tics,
|
||||
m_topspeed? 0 : m_interval,
|
||||
m_life->GetNumCells());
|
||||
m_tics,
|
||||
m_topspeed? 0 : m_interval,
|
||||
m_life->GetNumCells());
|
||||
m_text->SetLabel(msg);
|
||||
}
|
||||
|
||||
@@ -374,91 +374,91 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
|
||||
{
|
||||
switch (event.GetId())
|
||||
{
|
||||
case ID_NEW:
|
||||
{
|
||||
// stop if it was running
|
||||
OnStop();
|
||||
m_life->Clear();
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
break;
|
||||
}
|
||||
case ID_ABOUT:
|
||||
{
|
||||
LifeAboutDialog dialog(this);
|
||||
dialog.ShowModal();
|
||||
break;
|
||||
}
|
||||
case ID_EXIT:
|
||||
{
|
||||
// TRUE is to force the frame to close
|
||||
Close(TRUE);
|
||||
break;
|
||||
}
|
||||
case ID_SHOWNAV :
|
||||
{
|
||||
bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV);
|
||||
m_navigator->Show(checked);
|
||||
break;
|
||||
}
|
||||
case ID_INFO:
|
||||
{
|
||||
wxString desc = m_life->GetDescription();
|
||||
|
||||
if ( desc.IsEmpty() )
|
||||
desc = _("Not available");
|
||||
case ID_NEW:
|
||||
{
|
||||
// stop if it was running
|
||||
OnStop();
|
||||
m_life->Clear();
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
break;
|
||||
}
|
||||
case ID_ABOUT:
|
||||
{
|
||||
LifeAboutDialog dialog(this);
|
||||
dialog.ShowModal();
|
||||
break;
|
||||
}
|
||||
case ID_EXIT:
|
||||
{
|
||||
// TRUE is to force the frame to close
|
||||
Close(TRUE);
|
||||
break;
|
||||
}
|
||||
case ID_SHOWNAV :
|
||||
{
|
||||
bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV);
|
||||
m_navigator->Show(checked);
|
||||
break;
|
||||
}
|
||||
case ID_INFO:
|
||||
{
|
||||
wxString desc = m_life->GetDescription();
|
||||
|
||||
if ( desc.IsEmpty() )
|
||||
desc = _("Not available");
|
||||
|
||||
// should we make the description editable here?
|
||||
wxMessageBox(desc, _("Description"), wxOK | wxICON_INFORMATION);
|
||||
// should we make the description editable here?
|
||||
wxMessageBox(desc, _("Description"), wxOK | wxICON_INFORMATION);
|
||||
|
||||
break;
|
||||
}
|
||||
case ID_START : OnStart(); break;
|
||||
case ID_STEP : OnStep(); break;
|
||||
case ID_STOP : OnStop(); break;
|
||||
case ID_TOPSPEED:
|
||||
{
|
||||
m_running = TRUE;
|
||||
m_topspeed = TRUE;
|
||||
UpdateUI();
|
||||
while (m_running && m_topspeed)
|
||||
{
|
||||
OnStep();
|
||||
wxYield();
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ID_START : OnStart(); break;
|
||||
case ID_STEP : OnStep(); break;
|
||||
case ID_STOP : OnStop(); break;
|
||||
case ID_TOPSPEED:
|
||||
{
|
||||
m_running = TRUE;
|
||||
m_topspeed = TRUE;
|
||||
UpdateUI();
|
||||
while (m_running && m_topspeed)
|
||||
{
|
||||
OnStep();
|
||||
wxYield();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void LifeFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxFileDialog filedlg(this,
|
||||
_("Choose a file to open"),
|
||||
_(""),
|
||||
_(""),
|
||||
_("Life patterns (*.lif)|*.lif|All files (*.*)|*.*"),
|
||||
wxOPEN | wxFILE_MUST_EXIST);
|
||||
_("Choose a file to open"),
|
||||
_(""),
|
||||
_(""),
|
||||
_("Life patterns (*.lif)|*.lif|All files (*.*)|*.*"),
|
||||
wxOPEN | wxFILE_MUST_EXIST);
|
||||
|
||||
if (filedlg.ShowModal() == wxID_OK)
|
||||
{
|
||||
wxFileInputStream stream(filedlg.GetFilename());
|
||||
LifeReader reader(stream);
|
||||
wxFileInputStream stream(filedlg.GetPath());
|
||||
LifeReader reader(stream);
|
||||
|
||||
// the reader handles errors itself, no need to do anything here
|
||||
if (reader.IsOk())
|
||||
{
|
||||
// stop if running and put the pattern
|
||||
OnStop();
|
||||
m_life->Clear();
|
||||
m_life->SetPattern(reader.GetPattern());
|
||||
// the reader handles errors itself, no need to do anything here
|
||||
if (reader.IsOk())
|
||||
{
|
||||
// stop if running and put the pattern
|
||||
OnStop();
|
||||
m_life->Clear();
|
||||
m_life->SetPattern(reader.GetPattern());
|
||||
|
||||
// recenter canvas
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
}
|
||||
// recenter canvas
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -472,16 +472,16 @@ void LifeFrame::OnSamples(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
if (dialog.ShowModal() == wxID_OK)
|
||||
{
|
||||
const LifePattern pattern = dialog.GetPattern();
|
||||
const LifePattern pattern = dialog.GetPattern();
|
||||
|
||||
// put the pattern
|
||||
m_life->Clear();
|
||||
m_life->SetPattern(pattern);
|
||||
// put the pattern
|
||||
m_life->Clear();
|
||||
m_life->SetPattern(pattern);
|
||||
|
||||
// recenter canvas
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
// recenter canvas
|
||||
m_canvas->Recenter(0, 0);
|
||||
m_tics = 0;
|
||||
UpdateInfoText();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -491,13 +491,13 @@ void LifeFrame::OnZoom(wxCommandEvent& event)
|
||||
|
||||
if ((event.GetId() == ID_ZOOMIN) && cellsize < 32)
|
||||
{
|
||||
m_canvas->SetCellSize(cellsize * 2);
|
||||
UpdateUI();
|
||||
m_canvas->SetCellSize(cellsize * 2);
|
||||
UpdateUI();
|
||||
}
|
||||
else if ((event.GetId() == ID_ZOOMOUT) && cellsize > 1)
|
||||
{
|
||||
m_canvas->SetCellSize(cellsize / 2);
|
||||
UpdateUI();
|
||||
m_canvas->SetCellSize(cellsize / 2);
|
||||
UpdateUI();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -508,11 +508,11 @@ void LifeFrame::OnNavigate(wxCommandEvent& event)
|
||||
switch (event.GetId())
|
||||
{
|
||||
case ID_NORTH: c = m_life->FindNorth(); break;
|
||||
case ID_SOUTH: c = m_life->FindSouth(); break;
|
||||
case ID_WEST: c = m_life->FindWest(); break;
|
||||
case ID_EAST: c = m_life->FindEast(); break;
|
||||
case ID_CENTER: c = m_life->FindCenter(); break;
|
||||
case ID_ORIGIN: c.i = c.j = 0; break;
|
||||
case ID_SOUTH: c = m_life->FindSouth(); break;
|
||||
case ID_WEST: c = m_life->FindWest(); break;
|
||||
case ID_EAST: c = m_life->FindEast(); break;
|
||||
case ID_CENTER: c = m_life->FindCenter(); break;
|
||||
case ID_ORIGIN: c.i = c.j = 0; break;
|
||||
}
|
||||
|
||||
m_canvas->Recenter(c.i, c.j);
|
||||
@@ -524,8 +524,8 @@ void LifeFrame::OnSlider(wxScrollEvent& event)
|
||||
|
||||
if (m_running)
|
||||
{
|
||||
OnStop();
|
||||
OnStart();
|
||||
OnStop();
|
||||
OnStart();
|
||||
}
|
||||
|
||||
UpdateInfoText();
|
||||
@@ -550,9 +550,9 @@ void LifeFrame::OnStart()
|
||||
{
|
||||
if (!m_running)
|
||||
{
|
||||
m_timer->Start(m_interval);
|
||||
m_running = TRUE;
|
||||
UpdateUI();
|
||||
m_timer->Start(m_interval);
|
||||
m_running = TRUE;
|
||||
UpdateUI();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -560,19 +560,19 @@ void LifeFrame::OnStop()
|
||||
{
|
||||
if (m_running)
|
||||
{
|
||||
m_timer->Stop();
|
||||
m_running = FALSE;
|
||||
m_topspeed = FALSE;
|
||||
UpdateUI();
|
||||
m_timer->Stop();
|
||||
m_running = FALSE;
|
||||
m_topspeed = FALSE;
|
||||
UpdateUI();
|
||||
}
|
||||
}
|
||||
|
||||
void LifeFrame::OnStep()
|
||||
{
|
||||
if (m_life->NextTic())
|
||||
m_tics++;
|
||||
m_tics++;
|
||||
else
|
||||
OnStop();
|
||||
OnStop();
|
||||
|
||||
m_canvas->DrawChanged();
|
||||
UpdateInfoText();
|
||||
@@ -584,11 +584,11 @@ void LifeFrame::OnStep()
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
LifeNavigator::LifeNavigator(wxWindow *parent)
|
||||
: wxMiniFrame(parent, -1,
|
||||
_("Navigation"),
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxCAPTION | wxSIMPLE_BORDER)
|
||||
: wxMiniFrame(parent, -1,
|
||||
_("Navigation"),
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxCAPTION | wxSIMPLE_BORDER)
|
||||
{
|
||||
wxPanel *panel = new wxPanel(this, -1);
|
||||
wxBoxSizer *sizer1 = new wxBoxSizer(wxVERTICAL);
|
||||
@@ -596,11 +596,11 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
|
||||
|
||||
// create bitmaps and masks for the buttons
|
||||
wxBitmap
|
||||
bmpn = wxBITMAP(north),
|
||||
bmpw = wxBITMAP(west),
|
||||
bmpc = wxBITMAP(center),
|
||||
bmpe = wxBITMAP(east),
|
||||
bmps = wxBITMAP(south);
|
||||
bmpn = wxBITMAP(north),
|
||||
bmpw = wxBITMAP(west),
|
||||
bmpc = wxBITMAP(center),
|
||||
bmpe = wxBITMAP(east),
|
||||
bmps = wxBITMAP(south);
|
||||
|
||||
#if !defined(__WXGTK__) && !defined(__WXMOTIF__)
|
||||
bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
|
||||
@@ -612,11 +612,11 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
|
||||
|
||||
// create the buttons and attach tooltips to them
|
||||
wxBitmapButton
|
||||
*bn = new wxBitmapButton(panel, ID_NORTH, bmpn),
|
||||
*bw = new wxBitmapButton(panel, ID_WEST , bmpw),
|
||||
*bc = new wxBitmapButton(panel, ID_CENTER, bmpc),
|
||||
*be = new wxBitmapButton(panel, ID_EAST , bmpe),
|
||||
*bs = new wxBitmapButton(panel, ID_SOUTH, bmps);
|
||||
*bn = new wxBitmapButton(panel, ID_NORTH, bmpn),
|
||||
*bw = new wxBitmapButton(panel, ID_WEST , bmpw),
|
||||
*bc = new wxBitmapButton(panel, ID_CENTER, bmpc),
|
||||
*be = new wxBitmapButton(panel, ID_EAST , bmpe),
|
||||
*bs = new wxBitmapButton(panel, ID_SOUTH, bmps);
|
||||
|
||||
#if wxUSE_TOOLTIPS
|
||||
bn->SetToolTip(_("Find northernmost cell"));
|
||||
@@ -644,9 +644,9 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
|
||||
wxRect parentRect = parent->GetRect();
|
||||
wxSize childSize = GetSize();
|
||||
int x = parentRect.GetX() +
|
||||
parentRect.GetWidth();
|
||||
parentRect.GetWidth();
|
||||
int y = parentRect.GetY() +
|
||||
(parentRect.GetHeight() - childSize.GetHeight()) / 4;
|
||||
(parentRect.GetHeight() - childSize.GetHeight()) / 4;
|
||||
Move(x, y);
|
||||
|
||||
// done
|
||||
@@ -657,9 +657,9 @@ void LifeNavigator::OnClose(wxCloseEvent& event)
|
||||
{
|
||||
// avoid if we can
|
||||
if (event.CanVeto())
|
||||
event.Veto();
|
||||
event.Veto();
|
||||
else
|
||||
Destroy();
|
||||
Destroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -669,8 +669,8 @@ void LifeNavigator::OnClose(wxCloseEvent& event)
|
||||
|
||||
// canvas constructor
|
||||
LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive)
|
||||
: wxWindow(parent, -1, wxPoint(0, 0), wxSize(100, 100),
|
||||
wxSUNKEN_BORDER)
|
||||
: wxWindow(parent, -1, wxPoint(0, 0), wxSize(100, 100),
|
||||
wxSUNKEN_BORDER)
|
||||
{
|
||||
m_life = life;
|
||||
m_interactive = interactive;
|
||||
@@ -682,7 +682,7 @@ LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive)
|
||||
m_viewportW = 0;
|
||||
|
||||
if (m_interactive)
|
||||
SetCursor(*wxCROSS_CURSOR);
|
||||
SetCursor(*wxCROSS_CURSOR);
|
||||
|
||||
// reduce flicker if wxEVT_ERASE_BACKGROUND is not available
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
@@ -725,10 +725,10 @@ void LifeCanvas::SetCellSize(int cellsize)
|
||||
// adjust scrollbars
|
||||
if (m_interactive)
|
||||
{
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
}
|
||||
|
||||
Refresh(FALSE);
|
||||
@@ -755,14 +755,14 @@ void LifeCanvas::DrawCell(wxInt32 i, wxInt32 j, wxDC &dc)
|
||||
// if cellsize is 1 or 2, there will be no grid
|
||||
switch (m_cellsize)
|
||||
{
|
||||
case 1:
|
||||
dc.DrawPoint(x, y);
|
||||
break;
|
||||
case 2:
|
||||
dc.DrawRectangle(x, y, 2, 2);
|
||||
break;
|
||||
default:
|
||||
dc.DrawRectangle(x + 1, y + 1, m_cellsize - 1, m_cellsize - 1);
|
||||
case 1:
|
||||
dc.DrawPoint(x, y);
|
||||
break;
|
||||
case 2:
|
||||
dc.DrawRectangle(x, y, 2, 2);
|
||||
break;
|
||||
default:
|
||||
dc.DrawRectangle(x + 1, y + 1, m_cellsize - 1, m_cellsize - 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -776,30 +776,30 @@ void LifeCanvas::DrawChanged()
|
||||
bool done = FALSE;
|
||||
|
||||
m_life->BeginFind(m_viewportX,
|
||||
m_viewportY,
|
||||
m_viewportX + m_viewportW,
|
||||
m_viewportY + m_viewportH,
|
||||
TRUE);
|
||||
m_viewportY,
|
||||
m_viewportX + m_viewportW,
|
||||
m_viewportY + m_viewportH,
|
||||
TRUE);
|
||||
|
||||
dc.BeginDrawing();
|
||||
|
||||
if (m_cellsize == 1)
|
||||
{
|
||||
dc.SetPen(*wxBLACK_PEN);
|
||||
dc.SetPen(*wxBLACK_PEN);
|
||||
}
|
||||
else
|
||||
{
|
||||
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||
dc.SetBrush(*wxBLACK_BRUSH);
|
||||
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||
dc.SetBrush(*wxBLACK_BRUSH);
|
||||
}
|
||||
dc.SetLogicalFunction(wxINVERT);
|
||||
|
||||
while (!done)
|
||||
{
|
||||
done = m_life->FindMore(&cells, &ncells);
|
||||
done = m_life->FindMore(&cells, &ncells);
|
||||
|
||||
for (size_t m = 0; m < ncells; m++)
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
for (size_t m = 0; m < ncells; m++)
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
}
|
||||
dc.EndDrawing();
|
||||
}
|
||||
@@ -842,16 +842,16 @@ void LifeCanvas::OnPaint(wxPaintEvent& event)
|
||||
}
|
||||
else
|
||||
{
|
||||
x = CellToX(i0);
|
||||
y = CellToY(j0);
|
||||
w = CellToX(i1 + 1) - x + 1;
|
||||
h = CellToY(j1 + 1) - y + 1;
|
||||
x = CellToX(i0);
|
||||
y = CellToY(j0);
|
||||
w = CellToX(i1 + 1) - x + 1;
|
||||
h = CellToY(j1 + 1) - y + 1;
|
||||
|
||||
dc.SetPen(*wxLIGHT_GREY_PEN);
|
||||
for (wxInt32 yy = y; yy <= (y + h - m_cellsize); yy += m_cellsize)
|
||||
dc.DrawRectangle(x, yy, w, m_cellsize + 1);
|
||||
for (wxInt32 xx = x; xx <= (x + w - m_cellsize); xx += m_cellsize)
|
||||
dc.DrawLine(xx, y, xx, y + h);
|
||||
dc.SetPen(*wxLIGHT_GREY_PEN);
|
||||
for (wxInt32 yy = y; yy <= (y + h - m_cellsize); yy += m_cellsize)
|
||||
dc.DrawRectangle(x, yy, w, m_cellsize + 1);
|
||||
for (wxInt32 xx = x; xx <= (x + w - m_cellsize); xx += m_cellsize)
|
||||
dc.DrawLine(xx, y, xx, y + h);
|
||||
}
|
||||
|
||||
// draw all alive cells
|
||||
@@ -860,15 +860,15 @@ void LifeCanvas::OnPaint(wxPaintEvent& event)
|
||||
|
||||
while (!done)
|
||||
{
|
||||
for (size_t m = 0; m < ncells; m++)
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
for (size_t m = 0; m < ncells; m++)
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
|
||||
done = m_life->FindMore(&cells, &ncells);
|
||||
done = m_life->FindMore(&cells, &ncells);
|
||||
}
|
||||
|
||||
// last set
|
||||
for (size_t m = 0; m < ncells; m++)
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
DrawCell(cells[m].i, cells[m].j, dc);
|
||||
|
||||
dc.EndDrawing();
|
||||
}
|
||||
@@ -876,7 +876,7 @@ void LifeCanvas::OnPaint(wxPaintEvent& event)
|
||||
void LifeCanvas::OnMouse(wxMouseEvent& event)
|
||||
{
|
||||
if (!m_interactive)
|
||||
return;
|
||||
return;
|
||||
|
||||
// which cell are we pointing at?
|
||||
wxInt32 i = XToCell( event.GetX() );
|
||||
@@ -897,88 +897,88 @@ void LifeCanvas::OnMouse(wxMouseEvent& event)
|
||||
// is the button down?
|
||||
if (!event.LeftIsDown())
|
||||
{
|
||||
m_status = MOUSE_NOACTION;
|
||||
return;
|
||||
m_status = MOUSE_NOACTION;
|
||||
return;
|
||||
}
|
||||
|
||||
// was it pressed just now?
|
||||
if (event.LeftDown())
|
||||
{
|
||||
// yes: start a new action and toggle this cell
|
||||
m_status = (m_life->IsAlive(i, j)? MOUSE_ERASING : MOUSE_DRAWING);
|
||||
|
||||
m_mi = i;
|
||||
m_mj = j;
|
||||
m_life->SetCell(i, j, m_status == MOUSE_DRAWING);
|
||||
DrawCell(i, j, m_status == MOUSE_DRAWING);
|
||||
// yes: start a new action and toggle this cell
|
||||
m_status = (m_life->IsAlive(i, j)? MOUSE_ERASING : MOUSE_DRAWING);
|
||||
|
||||
m_mi = i;
|
||||
m_mj = j;
|
||||
m_life->SetCell(i, j, m_status == MOUSE_DRAWING);
|
||||
DrawCell(i, j, m_status == MOUSE_DRAWING);
|
||||
}
|
||||
else if ((m_mi != i) || (m_mj != j))
|
||||
{
|
||||
// no: continue ongoing action
|
||||
bool alive = (m_status == MOUSE_DRAWING);
|
||||
// no: continue ongoing action
|
||||
bool alive = (m_status == MOUSE_DRAWING);
|
||||
|
||||
// prepare DC and pen + brush to optimize drawing
|
||||
wxClientDC dc(this);
|
||||
dc.SetPen(alive? *wxBLACK_PEN : *wxWHITE_PEN);
|
||||
dc.SetBrush(alive? *wxBLACK_BRUSH : *wxWHITE_BRUSH);
|
||||
dc.BeginDrawing();
|
||||
// prepare DC and pen + brush to optimize drawing
|
||||
wxClientDC dc(this);
|
||||
dc.SetPen(alive? *wxBLACK_PEN : *wxWHITE_PEN);
|
||||
dc.SetBrush(alive? *wxBLACK_BRUSH : *wxWHITE_BRUSH);
|
||||
dc.BeginDrawing();
|
||||
|
||||
// draw a line of cells using Bresenham's algorithm
|
||||
wxInt32 d, ii, jj, di, ai, si, dj, aj, sj;
|
||||
di = i - m_mi;
|
||||
ai = abs(di) << 1;
|
||||
si = (di < 0)? -1 : 1;
|
||||
dj = j - m_mj;
|
||||
aj = abs(dj) << 1;
|
||||
sj = (dj < 0)? -1 : 1;
|
||||
// draw a line of cells using Bresenham's algorithm
|
||||
wxInt32 d, ii, jj, di, ai, si, dj, aj, sj;
|
||||
di = i - m_mi;
|
||||
ai = abs(di) << 1;
|
||||
si = (di < 0)? -1 : 1;
|
||||
dj = j - m_mj;
|
||||
aj = abs(dj) << 1;
|
||||
sj = (dj < 0)? -1 : 1;
|
||||
|
||||
ii = m_mi;
|
||||
jj = m_mj;
|
||||
ii = m_mi;
|
||||
jj = m_mj;
|
||||
|
||||
if (ai > aj)
|
||||
{
|
||||
// iterate over i
|
||||
d = aj - (ai >> 1);
|
||||
|
||||
while (ii != i)
|
||||
{
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
if (d >= 0)
|
||||
{
|
||||
jj += sj;
|
||||
d -= ai;
|
||||
}
|
||||
ii += si;
|
||||
d += aj;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// iterate over j
|
||||
d = ai - (aj >> 1);
|
||||
if (ai > aj)
|
||||
{
|
||||
// iterate over i
|
||||
d = aj - (ai >> 1);
|
||||
|
||||
while (ii != i)
|
||||
{
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
if (d >= 0)
|
||||
{
|
||||
jj += sj;
|
||||
d -= ai;
|
||||
}
|
||||
ii += si;
|
||||
d += aj;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// iterate over j
|
||||
d = ai - (aj >> 1);
|
||||
|
||||
while (jj != j)
|
||||
{
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
if (d >= 0)
|
||||
{
|
||||
ii += si;
|
||||
d -= aj;
|
||||
}
|
||||
jj += sj;
|
||||
d += ai;
|
||||
}
|
||||
}
|
||||
while (jj != j)
|
||||
{
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
if (d >= 0)
|
||||
{
|
||||
ii += si;
|
||||
d -= aj;
|
||||
}
|
||||
jj += sj;
|
||||
d += ai;
|
||||
}
|
||||
}
|
||||
|
||||
// last cell
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
m_mi = ii;
|
||||
m_mj = jj;
|
||||
// last cell
|
||||
m_life->SetCell(ii, jj, alive);
|
||||
DrawCell(ii, jj, dc);
|
||||
m_mi = ii;
|
||||
m_mj = jj;
|
||||
|
||||
dc.EndDrawing();
|
||||
dc.EndDrawing();
|
||||
}
|
||||
|
||||
((LifeFrame *) wxGetApp().GetTopWindow())->UpdateInfoText();
|
||||
@@ -1003,10 +1003,10 @@ void LifeCanvas::OnSize(wxSizeEvent& event)
|
||||
// scrollbars
|
||||
if (m_interactive)
|
||||
{
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
}
|
||||
|
||||
// allow default processing
|
||||
@@ -1023,45 +1023,45 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
|
||||
int scrollinc = 0;
|
||||
switch (type)
|
||||
{
|
||||
case wxEVT_SCROLLWIN_TOP:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
scrollinc = -m_viewportW;
|
||||
else
|
||||
scrollinc = -m_viewportH;
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_BOTTOM:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
scrollinc = m_viewportW;
|
||||
else
|
||||
scrollinc = m_viewportH;
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_LINEUP: scrollinc = -1; break;
|
||||
case wxEVT_SCROLLWIN_LINEDOWN: scrollinc = +1; break;
|
||||
case wxEVT_SCROLLWIN_PAGEUP: scrollinc = -10; break;
|
||||
case wxEVT_SCROLLWIN_PAGEDOWN: scrollinc = +10; break;
|
||||
case wxEVT_SCROLLWIN_THUMBTRACK:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
{
|
||||
scrollinc = pos - m_thumbX;
|
||||
m_thumbX = pos;
|
||||
}
|
||||
else
|
||||
{
|
||||
scrollinc = pos - m_thumbY;
|
||||
m_thumbY = pos;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_THUMBRELEASE:
|
||||
{
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_TOP:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
scrollinc = -m_viewportW;
|
||||
else
|
||||
scrollinc = -m_viewportH;
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_BOTTOM:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
scrollinc = m_viewportW;
|
||||
else
|
||||
scrollinc = m_viewportH;
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_LINEUP: scrollinc = -1; break;
|
||||
case wxEVT_SCROLLWIN_LINEDOWN: scrollinc = +1; break;
|
||||
case wxEVT_SCROLLWIN_PAGEUP: scrollinc = -10; break;
|
||||
case wxEVT_SCROLLWIN_PAGEDOWN: scrollinc = +10; break;
|
||||
case wxEVT_SCROLLWIN_THUMBTRACK:
|
||||
{
|
||||
if (orient == wxHORIZONTAL)
|
||||
{
|
||||
scrollinc = pos - m_thumbX;
|
||||
m_thumbX = pos;
|
||||
}
|
||||
else
|
||||
{
|
||||
scrollinc = pos - m_thumbY;
|
||||
m_thumbY = pos;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case wxEVT_SCROLLWIN_THUMBRELEASE:
|
||||
{
|
||||
m_thumbX = m_viewportW;
|
||||
m_thumbY = m_viewportH;
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
||||
@@ -1069,8 +1069,8 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
|
||||
// so reset it back as we always want it to be in the same position.
|
||||
if (type != wxEVT_SCROLLWIN_THUMBTRACK)
|
||||
{
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);
|
||||
SetScrollbar(wxVERTICAL, m_viewportH, m_viewportH, 3 * m_viewportH);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1079,13 +1079,13 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
|
||||
// scroll the window and adjust the viewport
|
||||
if (orient == wxHORIZONTAL)
|
||||
{
|
||||
m_viewportX += scrollinc;
|
||||
ScrollWindow( -m_cellsize * scrollinc, 0, (const wxRect *) NULL);
|
||||
m_viewportX += scrollinc;
|
||||
ScrollWindow( -m_cellsize * scrollinc, 0, (const wxRect *) NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_viewportY += scrollinc;
|
||||
ScrollWindow( 0, -m_cellsize * scrollinc, (const wxRect *) NULL);
|
||||
m_viewportY += scrollinc;
|
||||
ScrollWindow( 0, -m_cellsize * scrollinc, (const wxRect *) NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
|
||||
LifeReader::LifeReader(wxInputStream& is)
|
||||
{
|
||||
wxBufferedInputStream buff_is = wxBufferedInputStream(is);
|
||||
wxTextInputStream text_is = wxTextInputStream(buff_is);
|
||||
wxBufferedInputStream buff_is(is);
|
||||
wxTextInputStream text_is(buff_is);
|
||||
wxString line, rest;
|
||||
|
||||
// check stream
|
||||
|
||||
179
demos/poem/PoemVC.dsp
Normal file
179
demos/poem/PoemVC.dsp
Normal file
@@ -0,0 +1,179 @@
|
||||
# Microsoft Developer Studio Project File - Name="PoemVC" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=PoemVC - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "PoemVC.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "PoemVC.mak" CFG="PoemVC - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "PoemVC - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "PoemVC - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "PoemVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "PoemVC - Win32 Release DLL" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "PoemVC - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxpoem.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxpoem.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "DebugDLL"
|
||||
# PROP BASE Intermediate_Dir "DebugDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxpoem.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Release DLL"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "ReleaseDLL"
|
||||
# PROP BASE Intermediate_Dir "ReleaseDLL"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
|
||||
# SUBTRACT CPP /YX
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
|
||||
# ADD BASE RSC /l 0x809 /d "NDEBUG"
|
||||
# ADD RSC /l 0x809 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxpoem.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "PoemVC - Win32 Release"
|
||||
# Name "PoemVC - Win32 Debug"
|
||||
# Name "PoemVC - Win32 Debug DLL"
|
||||
# Name "PoemVC - Win32 Release DLL"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wxpoem.cpp
|
||||
|
||||
!IF "$(CFG)" == "PoemVC - Win32 Release"
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug"
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Debug DLL"
|
||||
|
||||
# SUBTRACT BASE CPP /YX /Yc /Yu
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "PoemVC - Win32 Release DLL"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wxpoem.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\wxpoem.rc
|
||||
# ADD BASE RSC /l 0x809
|
||||
# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
29
demos/poem/PoemVC.dsw
Normal file
29
demos/poem/PoemVC.dsw
Normal file
@@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "PoemVC"=.\PoemVC.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -510,7 +510,9 @@ void MainWindow::Search(bool ask)
|
||||
if (s != "")
|
||||
{
|
||||
if (search_string) delete[] search_string;
|
||||
|
||||
search_string = copystring(s);
|
||||
|
||||
search_ok = TRUE;
|
||||
} else search_ok = FALSE;
|
||||
}
|
||||
@@ -683,7 +685,9 @@ int MyApp::OnExit()
|
||||
delete NormalFont;
|
||||
delete BoldFont;
|
||||
delete ItalicFont;
|
||||
delete poem_buffer;
|
||||
delete[] poem_buffer;
|
||||
if (search_string)
|
||||
delete[] search_string;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -922,7 +926,7 @@ long MainWindow::DoSearch(void)
|
||||
FILE *file;
|
||||
long i = 0;
|
||||
int ch = 0;
|
||||
char buf[100];
|
||||
char buf[512];
|
||||
long find_start;
|
||||
long previous_poem_start;
|
||||
|
||||
@@ -993,7 +997,7 @@ long MainWindow::DoSearch(void)
|
||||
// Load index (or compile it if none found)
|
||||
void TryLoadIndex()
|
||||
{
|
||||
index_ok = LoadIndex(index_filename);
|
||||
index_ok = (LoadIndex(index_filename) != 0);
|
||||
if (!index_ok || (nitems == 0))
|
||||
{
|
||||
PoetryError("Index file not found; will compile new one", "wxPoem");
|
||||
@@ -1021,7 +1025,7 @@ bool Compile(void)
|
||||
long i = 0;
|
||||
int j;
|
||||
int ch = 0;
|
||||
char buf[100];
|
||||
char buf[512];
|
||||
|
||||
if (data_filename)
|
||||
sprintf(buf, "%s.dat", data_filename);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
*.spec
|
||||
BuildCVS.txt
|
||||
acconfig.h
|
||||
*.m4
|
||||
autogen.sh
|
||||
configure
|
||||
@@ -33,7 +32,9 @@ distrib/msw/tmake/makeall.bat
|
||||
distrib/msw/tmake/makeall.sh
|
||||
distrib/msw/tmake/wxwin.pro
|
||||
distrib/msw/tmake/tmake.conf
|
||||
distrib/gtk/*
|
||||
distrib/gtk/*.txt
|
||||
distrib/gtk/Setup
|
||||
distrib/gtk/copy_src
|
||||
|
||||
locale/*.po
|
||||
locale/*.mo
|
||||
@@ -106,7 +107,11 @@ src/png/TODO
|
||||
src/png/*.1
|
||||
src/png/*.3
|
||||
src/png/*.5
|
||||
src/png/scripts/*
|
||||
src/png/scripts/*.ppc
|
||||
src/png/scripts/*.bat
|
||||
src/png/scripts/makefile*
|
||||
src/png/scripts/*.com
|
||||
src/png/scripts/*.def
|
||||
|
||||
src/zlib/*.c
|
||||
src/zlib/*.h
|
||||
|
||||
40
distrib/msw/innobott.txt
Normal file
40
distrib/msw/innobott.txt
Normal file
@@ -0,0 +1,40 @@
|
||||
|
||||
[Icons]
|
||||
Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0
|
||||
Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\Life! Demo; Filename: {app}\bin\life.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\life.exe; IconIndex: 0
|
||||
Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0
|
||||
Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0
|
||||
Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\wxWindows Help; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
|
||||
Name: {group}\HTML Docs Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
|
||||
|
||||
[INI]
|
||||
|
||||
[Registry]
|
||||
|
||||
[UninstallDelete]
|
||||
|
||||
[InstallDelete]
|
||||
|
||||
[Run]
|
||||
|
||||
[UninstallRun]
|
||||
|
||||
|
||||
; ==============================================
|
||||
; The lines below are used by ScriptMaker
|
||||
; They are not required by Inno Setup
|
||||
; DO NOT DELETE THEM or you may be unable to reload the script
|
||||
|
||||
;[ScriptSetup]
|
||||
;VerNum=2.2.7
|
||||
;InnoVer=1.3
|
||||
;AddVerTo=AppVerName
|
||||
;SetupFilename=setup.exe
|
||||
;OutputFolder=C:\wx2stable\wxWindows\deliver
|
||||
;CopyrightText=Copyright <20> The wxWindows Team
|
||||
|
||||
45
distrib/msw/innotop.txt
Normal file
45
distrib/msw/innotop.txt
Normal file
@@ -0,0 +1,45 @@
|
||||
; Inno Setup Script
|
||||
; Created with ScriptMaker Version 1.3.22
|
||||
; 29 January 2001 at 14:22
|
||||
|
||||
[Setup]
|
||||
MinVersion=4.0,4.0
|
||||
AppName=wxWindows 2.2.9
|
||||
AppId=wxWindows
|
||||
CreateUninstallRegKey=1
|
||||
UsePreviousAppDir=0
|
||||
UsePreviousGroup=0
|
||||
AppVersion=2.2.9
|
||||
AppVerName=wxWindows 2.2.9
|
||||
AppCopyright=Copyright <20> The wxWindows Team
|
||||
BackColor=$FF0000
|
||||
BackColor2=$000000
|
||||
BackColorDirection=toptobottom
|
||||
WindowShowCaption=1
|
||||
WindowStartMaximized=1
|
||||
WindowVisible=1
|
||||
WindowResizable=1
|
||||
UninstallDisplayName=wxWindows 2.2.9
|
||||
UninstallLogMode=Append
|
||||
DirExistsWarning=auto
|
||||
UninstallFilesDir={app}
|
||||
DisableDirPage=0
|
||||
DisableStartupPrompt=0
|
||||
CreateAppDir=1
|
||||
DisableProgramGroupPage=0
|
||||
AlwaysCreateUninstallIcon=1
|
||||
UninstallIconName=Uninstall wxWindows 2.2.9
|
||||
Uninstallable=1
|
||||
DefaultDirName=c:\wx2 DefaultGroupName=wxWindows 2.2.9
|
||||
LicenseFile=C:\wx2stable\wxWindows\docs\licence.txt
|
||||
InfoBeforeFile=C:\wx2stable\wxWindows\docs\readme.txt
|
||||
InfoAfterFile=C:\wx2stable\wxWindows\docs\msw\install.txt
|
||||
MessagesFile=compiler:default.isl
|
||||
DiskSpanning=1
|
||||
DiskSize=1457664
|
||||
DiskClusterSize=512
|
||||
ReserveBytes=0
|
||||
UseSetupLdr=1
|
||||
SourceDir=C:\wx2stable\wxWindows\deliver\wx
|
||||
OutputDir=C:\wx2stable\wxWindows\deliver
|
||||
|
||||
@@ -19,7 +19,7 @@ Rem The following line is for a specific environment -- edit, or comment out
|
||||
if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=d:\wx2sta~1\wxwind~1
|
||||
|
||||
echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
|
||||
set BUILDDEST=o:\wxWinBuild
|
||||
set BUILDDEST=%TEMP%\wxWinBuild
|
||||
Rem Only carry on if we haven't specified a single target
|
||||
set CARRYON=0
|
||||
|
||||
@@ -217,12 +217,12 @@ make -f makefile.b32
|
||||
cd %WXDIR%\contrib\samples\ogl\ogledit
|
||||
make -f makefile.b32 clean
|
||||
make -f makefile.b32
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
copy *.exe %BUILDDEST%\BC55Debug
|
||||
make -f makefile.b32 clean
|
||||
cd %WXDIR%\contrib\samples\ogl\studio
|
||||
make -f makefile.b32 clean
|
||||
make -f makefile.b32
|
||||
copy *.exe %BUILDDEST%\BC55Release
|
||||
copy *.exe %BUILDDEST%\BC55Debug
|
||||
make -f makefile.b32 clean
|
||||
cd %WXDIR%\contrib\src\ogl
|
||||
make -f makefile.b32 clean
|
||||
|
||||
@@ -38,6 +38,7 @@ samples/image/Makefile.in
|
||||
samples/joytest/Makefile.in
|
||||
samples/layout/Makefile.in
|
||||
samples/listctrl/Makefile.in
|
||||
samples/memcheck/Makefile.in
|
||||
samples/mdi/Makefile.in
|
||||
samples/minifram/Makefile.in
|
||||
samples/minimal/Makefile.in
|
||||
@@ -76,6 +77,11 @@ demos/life/Makefile.in
|
||||
demos/dbbrowse/Makefile.in
|
||||
utils/dialoged/Makefile.in
|
||||
utils/dialoged/src/Makefile.in
|
||||
utils/tex2rtf/Makefile.in
|
||||
utils/tex2rtf/src/Makefile.in
|
||||
utils/makegen/Makefile.in
|
||||
utils/HelpGen/Makefile.in
|
||||
utils/HelpGen/src/Makefile.in
|
||||
utils/Makefile.in
|
||||
utils/hhp2cached/Makefile.in
|
||||
contrib/Makefile.in
|
||||
|
||||
71
distrib/msw/makeinno.bat
Executable file
71
distrib/msw/makeinno.bat
Executable file
@@ -0,0 +1,71 @@
|
||||
@echo off
|
||||
Rem Make an Inno Setup distribution list, where files and dirs are represented by
|
||||
Rem sections like this:
|
||||
Rem [Dirs]
|
||||
Rem Name: {app}\docs
|
||||
Rem
|
||||
Rem [Files]
|
||||
Rem Source: c:\wx2stable\wxWindows\deliver2\docs\readme.txt; DestDir: {app}\docs\; DestName: readme.txt
|
||||
|
||||
set wxwindir=c:\wx2stable\wxWindows
|
||||
|
||||
Rem Generate a list of all files in the distribution.
|
||||
Rem We have to be in the right directory already.
|
||||
dir /BS >& %TEMP\files1.tmp
|
||||
|
||||
Rem Now we iterate through the list of files, writing out the middle section of
|
||||
Rem the file.
|
||||
Rem We have to remove the first part of the path,
|
||||
Rem by truncating the start by the size of the current directory.
|
||||
|
||||
set sz=%@EVAL[%@LEN[%_CWD]+1]
|
||||
set len=%@LINES[%TEMP\files1.tmp]
|
||||
|
||||
erase /Y %TEMP\files2.tmp
|
||||
|
||||
Rem Add directories
|
||||
|
||||
echo. >> %temp\files2.tmp
|
||||
echo [Dirs] >> %temp\files2.tmp
|
||||
|
||||
do i = 0 to %len by 1
|
||||
set line=%@LINE[%TEMP\files1.tmp,%i]
|
||||
Rem Skip files.
|
||||
if not isdir %line enddo
|
||||
set sz2=%@LEN[%line]
|
||||
set n=%@EVAL[%sz2-%sz]
|
||||
set line2=%@SUBSTR[%line,%sz,%n]
|
||||
if "%line2%" == "" enddo
|
||||
|
||||
echo Name: {app}\%line2 >> %TEMP\files2.tmp
|
||||
enddo
|
||||
|
||||
echo. >>%TEMP\files2.tmp
|
||||
|
||||
Rem Add files
|
||||
|
||||
echo. >> %temp\files2.tmp
|
||||
echo [Files] >> %temp\files2.tmp
|
||||
|
||||
do i = 0 to %len by 1
|
||||
set line=%@LINE[%TEMP\files1.tmp,%i]
|
||||
Rem Skip directories.
|
||||
if isdir %line enddo
|
||||
set sz2=%@LEN[%line]
|
||||
set n=%@EVAL[%sz2-%sz]
|
||||
set line2=%@SUBSTR[%line,%sz,%n]
|
||||
set filename=%@FILENAME[%line2]
|
||||
set dirname=%@PATH[%line2]
|
||||
|
||||
echo Source: %line; DestDir: {app}\%dirname; DestName: %filename >> %TEMP\files2.tmp
|
||||
enddo
|
||||
|
||||
Rem Concatenate the 3 sections
|
||||
cat %wxwindir\distrib\msw\innotop.txt %TEMP\files2.tmp %wxwindir\distrib\msw\innobott.txt > %wxwindir\distrib\msw\wxwin2.iss
|
||||
|
||||
erase /Y %TEMP\files1.tmp
|
||||
rem erase /Y %TEMP\files2.tmp
|
||||
|
||||
goto end
|
||||
|
||||
:end
|
||||
@@ -22,7 +22,11 @@ set len=%@LINES[%TEMP\files1.tmp]
|
||||
erase /Y %TEMP\files2.tmp
|
||||
|
||||
Rem, first add system files
|
||||
cat %WXWIN\distrib\msw\wisesys.txt > %temp\files2.tmp
|
||||
Rem NB: not doing this for now, because I'm not sure which are the right files
|
||||
Rem for Win9x/NT/W2K
|
||||
Rem cat %WXWIN\distrib\msw\wisesys.txt > %temp\files2.tmp
|
||||
|
||||
echo. > %temp\files2.tmp
|
||||
|
||||
do i = 0 to %len by 1
|
||||
set line=%@LINE[%TEMP\files1.tmp,%i]
|
||||
|
||||
@@ -1,20 +1,48 @@
|
||||
#!/bin/sh
|
||||
# tardist: make up a tar.gz distribution of wxWindows 2
|
||||
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
|
||||
# THIS SCRIPT IS OBSOLETE: USE E.G. TARWXMOTIF INSTEAD
|
||||
|
||||
# We can't use e.g. this:
|
||||
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
|
||||
# because there's not enough space on the command line, plus we need to ignore the
|
||||
# blank lines.
|
||||
|
||||
expandlines()
|
||||
{
|
||||
toexpand=$1
|
||||
outputfile=$2
|
||||
|
||||
rm -f $outputfile
|
||||
touch $outputfile
|
||||
for line in `cat $toexpand` ; do
|
||||
if [ "$line" != "" ]; then
|
||||
ls $line >> $outputfile
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
init=""
|
||||
WXVER=2.2.1
|
||||
if [ $1 = "" ]
|
||||
if [ "$1" = "" ]
|
||||
then
|
||||
echo Usage: tardist wx-dir output-dir version
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ $2 = "" ]
|
||||
if [ "$2" = "" ]
|
||||
then
|
||||
echo Usage: tardist wx-dir output-dir version
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ "$3" = "" ]
|
||||
then
|
||||
echo Usage: tardist wx-dir output-dir version
|
||||
exit
|
||||
fi
|
||||
|
||||
WXVER=$3
|
||||
|
||||
echo About to archive wxWindows:
|
||||
echo From $1
|
||||
echo To $2
|
||||
@@ -26,78 +54,88 @@ cd $1
|
||||
echo Removing backup files...
|
||||
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
|
||||
|
||||
rm -f $2/wx${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2.tgz
|
||||
rm -f $2/ogl3.tgz
|
||||
rm -f $2/jpeg.tgz
|
||||
rm -f $2/tiff.tgz
|
||||
rm -f $2/wx*-${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2-*.tgz
|
||||
rm -f $2/dialoged-*.tgz
|
||||
rm -f $2/ogl3-*.tgz
|
||||
rm -f $2/jpeg-*.tgz
|
||||
rm -f $2/tiff-*.tgz
|
||||
rm -f $2/stc-*.tgz
|
||||
rm -f $2/canvas-*.tgz
|
||||
rm -f $2/contrib-*.tgz
|
||||
|
||||
echo Tarring...
|
||||
|
||||
### Generic
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
|
||||
tar cvf $2/wx${WXVER}gen.tar -T /tmp/wxgen.txt
|
||||
gzip $2/wx${WXVER}gen.tar
|
||||
mv $2/wx${WXVER}gen.tar.gz $2/wx${WXVER}gen.tgz
|
||||
tar cvf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
|
||||
gzip $2/wxWindows-${WXVER}-gen.tar
|
||||
mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
|
||||
|
||||
### wxGTK
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wx${WXVER}gtk.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wx${WXVER}gtk.tar
|
||||
mv $2/wx${WXVER}gtk.tar.gz $2/wx${WXVER}gtk.tgz
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wxGTK-${WXVER}.tar
|
||||
mv $2/wxGTK-${WXVER}.tar.gz $2/wxGTK-${WXVER}.tgz
|
||||
|
||||
### wxMotif
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
|
||||
tar cvf $2/wx${WXVER}mot.tar -T /tmp/wxmotif.txt
|
||||
gzip $2/wx${WXVER}mot.tar
|
||||
mv $2/wx${WXVER}mot.tar.gz $2/wx${WXVER}mot.tgz
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmotif.txt
|
||||
tar cvf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
|
||||
gzip $2/wxMotif-${WXVER}.tar
|
||||
mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
|
||||
|
||||
### wxMSW
|
||||
ls `cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmsw.txt
|
||||
tar cvf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
|
||||
gzip $2/wxMSW-${WXVER}.tar
|
||||
mv $2/wxMSW-${WXVER}.tar.gz $2/wxMSW-${WXVER}.tgz
|
||||
|
||||
### Doc sources
|
||||
ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
|
||||
tar cvf $2/wx${WXVER}doc.tar -T /tmp/docsrc.txt
|
||||
gzip $2/wx${WXVER}doc.tar
|
||||
mv $2/wx${WXVER}doc.tar.gz $2/wx${WXVER}doc.tgz
|
||||
tar cvf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
|
||||
gzip $2/wxWindows-${WXVER}-doc.tar
|
||||
mv $2/wxWindows-${WXVER}-doc.tar.gz $2/wxWindows-${WXVER}-doc.tgz
|
||||
|
||||
### HTML docs
|
||||
ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
|
||||
tar cvf $2/wx${WXVER}htm.tar -T /tmp/html.txt
|
||||
gzip $2/wx${WXVER}htm.tar
|
||||
mv $2/wx${WXVER}htm.tar.gz $2/wx${WXVER}htm.tgz
|
||||
tar cvf $2/wxWindows-${WXVER}-htm.tar -T /tmp/html.txt
|
||||
gzip $2/wxWindows-${WXVER}-htm.tar
|
||||
mv $2/wxWindows-${WXVER}-htm.tar.gz $2/wxWindows-${WXVER}-htm.tgz
|
||||
|
||||
### PDF docs
|
||||
ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
|
||||
tar cvf $2/wx${WXVER}pdf.tar -T /tmp/pdf.txt
|
||||
gzip $2/wx${WXVER}pdf.tar
|
||||
mv $2/wx${WXVER}pdf.tar.gz $2/wx${WXVER}pdf.tgz
|
||||
tar cvf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt
|
||||
gzip $2/wxWindows-${WXVER}-pdf.tar
|
||||
mv $2/wxWindows-${WXVER}-pdf.tar.gz $2/wxWindows-${WXVER}-pdf.tgz
|
||||
|
||||
### Stubs files
|
||||
ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
tar cvf $2/wx${WXVER}stubs.tar -T /tmp/stubs.txt
|
||||
gzip $2/wx${WXVER}stubs.tar
|
||||
mv $2/wx${WXVER}stubs.tar.gz $2/wx${WXVER}stubs.tgz
|
||||
#ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
|
||||
#gzip $2/wxWindows-${WXVER}-stubs.tar
|
||||
#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
|
||||
|
||||
### Tex2RTF
|
||||
ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
|
||||
tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2.tar
|
||||
mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
|
||||
tar cvf $2/tex2rtf2-${WXVER}.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2-${WXVER}.tar
|
||||
mv $2/tex2rtf2-${WXVER}.tar.gz $2/tex2rtf2-${WXVER}.tgz
|
||||
|
||||
### OGL
|
||||
ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
|
||||
tar cvf $2/ogl3.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3.tar
|
||||
mv $2/ogl3.tar.gz $2/ogl3.tgz
|
||||
tar cvf $2/ogl3-${WXVER}.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3-${WXVER}.tar
|
||||
mv $2/ogl3-${WXVER}.tar.gz $2/ogl3-${WXVER}.tgz
|
||||
|
||||
### JPEG
|
||||
ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
|
||||
tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg.tar
|
||||
mv $2/jpeg.tar.gz $2/jpeg.tgz
|
||||
tar cvf $2/jpeg-${WXVER}.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg-${WXVER}.tar
|
||||
mv $2/jpeg-${WXVER}.tar.gz $2/jpeg-${WXVER}.tgz
|
||||
|
||||
### TIFF
|
||||
ls `cat $1/distrib/msw/tiff.rsp` > /tmp/tiff.txt
|
||||
tar cvf $2/tiff.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff.tar
|
||||
mv $2/tiff.tar.gz $2/tiff.tgz
|
||||
tar cvf $2/tiff-${WXVER}.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff-${WXVER}.tar
|
||||
mv $2/tiff-${WXVER}.tar.gz $2/tiff-${WXVER}.tgz
|
||||
|
||||
echo Done!
|
||||
|
||||
@@ -44,6 +44,17 @@
|
||||
$project{"BASE_UNIX_DEPS"} .= $filedep . " ";
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxMSW) {
|
||||
next unless $wxMSW{$file} =~ /\bB\b/;
|
||||
|
||||
($fileobj = $file) =~ s/cp?p?$/\o/;
|
||||
($filedep = $file) =~ s/cp?p?$/\d/;
|
||||
|
||||
$project{"BASE_SOURCES"} .= "msw/" . $file . " ";
|
||||
$project{"BASE_MSW_OBJS"} .= $fileobj . " ";
|
||||
$project{"BASE_MSW_DEPS"} .= $filedep . " ";
|
||||
}
|
||||
|
||||
#! find all our headers
|
||||
foreach $file (sort keys %wxWXINCLUDE) {
|
||||
next unless $wxWXINCLUDE{$file} =~ /\bB\b/;
|
||||
@@ -57,6 +68,12 @@
|
||||
$project{"BASE_HEADERS"} .= "unix/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxMSWINCLUDE) {
|
||||
next unless $wxMSWINCLUDE{$file} =~ /\bB\b/;
|
||||
|
||||
$project{"BASE_HEADERS"} .= "msw/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
|
||||
next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/;
|
||||
|
||||
@@ -80,5 +97,12 @@ BASE_DEPS = \
|
||||
BASE_UNIX_OBJS = \
|
||||
#$ ExpandList("BASE_UNIX_OBJS");
|
||||
|
||||
BASE_DEPS = \
|
||||
#$ ExpandList("BASE_DEPS");
|
||||
BASE_UNIX_DEPS = \
|
||||
#$ ExpandList("BASE_UNIX_DEPS");
|
||||
|
||||
BASE_MSW_OBJS = \
|
||||
#$ ExpandList("BASE_MSW_OBJS");
|
||||
|
||||
BASE_MSW_DEPS = \
|
||||
#$ ExpandList("BASE_MSW_DEPS");
|
||||
|
||||
|
||||
@@ -59,6 +59,8 @@
|
||||
$wxHTMLINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "F" ) {
|
||||
$wxMOTIFINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "9" && $fields[2] eq "O" ) {
|
||||
$wxOLEINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "9" ) {
|
||||
$wxMSWINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "K" ) {
|
||||
|
||||
@@ -409,6 +409,7 @@ gauge.cpp X
|
||||
gdiobj.cpp X
|
||||
glcanvas.cpp X
|
||||
icon.cpp X
|
||||
joystick.cpp X
|
||||
listbox.cpp X
|
||||
main.cpp X
|
||||
mdi.cpp X
|
||||
@@ -619,7 +620,6 @@ hash.h W B
|
||||
help.h W
|
||||
helpbase.h W
|
||||
helphtml.h W
|
||||
helpchm.h W
|
||||
helpwin.h W
|
||||
helpxlp.h W
|
||||
icon.h W
|
||||
@@ -687,7 +687,6 @@ scrolbar.h W
|
||||
scrolwin.h W
|
||||
serbase.h W B
|
||||
settings.h W
|
||||
setup.h W B
|
||||
sizer.h W
|
||||
slider.h W
|
||||
socket.h W B
|
||||
@@ -821,7 +820,6 @@ control.h F
|
||||
cursor.h F
|
||||
dataform.h F
|
||||
dataobj.h F
|
||||
dataobj2.h F
|
||||
dc.h F
|
||||
dcclient.h F
|
||||
dcmemory.h F
|
||||
@@ -939,6 +937,7 @@ slider.h 9
|
||||
slider95.h 9
|
||||
slidrmsw.h 9
|
||||
spinbutt.h 9
|
||||
spinctrl.h 9
|
||||
statbmp.h 9
|
||||
statbox.h 9
|
||||
statbr95.h 9
|
||||
@@ -982,6 +981,15 @@ xpmhand.h 9
|
||||
# disable.bmp 9
|
||||
# wx.rc 9
|
||||
|
||||
automtn.h 9 O
|
||||
dataform.h 9 O
|
||||
dataobj.h 9 O
|
||||
dataobj2.h 9 O
|
||||
dropsrc.h 9 O
|
||||
droptgt.h 9 O
|
||||
oleutils.h 9 O
|
||||
uuid.h 9 O
|
||||
|
||||
accel.h 2
|
||||
dataobj.h 2
|
||||
helpwin.h 2
|
||||
|
||||
@@ -442,6 +442,8 @@ clean:
|
||||
-$(RM) ../xpm/*.bak
|
||||
-$(RM) ../tiff/*.o
|
||||
-$(RM) ../tiff/*.bak
|
||||
|
||||
cleanall: clean
|
||||
-$(RM) $(WXLIB)
|
||||
-$(RM) $(ZLIBLIB)
|
||||
-$(RM) $(PNGLIB)
|
||||
@@ -458,7 +460,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
cleanall: clean
|
||||
|
||||
|
||||
|
||||
@@ -39,15 +39,20 @@
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxMSW) {
|
||||
#! OLE files can'be compiled with mingw32 yet
|
||||
next if $wxMSW{$file} =~ /\b(O|16)\b/;
|
||||
next if $wxMSW{$file} =~ /\b16\b/;
|
||||
|
||||
($fileobj = $file) =~ s/cp?p?$/\o/;
|
||||
($filedep = $file) =~ s/cp?p?$/\d/;
|
||||
|
||||
$project{"MSW_SOURCES"} .= "msw/" . $file . " ";
|
||||
$project{"GUIOBJS"} .= $fileobj . " ";
|
||||
$project{"GUIDEPS"} .= $filedep . " "
|
||||
|
||||
if( $wxMSW{$file} =~ /\bO\b/ ) {
|
||||
$project{"MSW_SOURCES"} .= "msw/ole/" . $file . " ";
|
||||
$project{"OLEOBJS"} .= $fileobj . " ";
|
||||
$project{"OLEDEPS"} .= $filedep . " ";
|
||||
} else {
|
||||
$project{"MSW_SOURCES"} .= "msw/" . $file . " ";
|
||||
$project{"GUIOBJS"} .= $fileobj . " ";
|
||||
$project{"GUIDEPS"} .= $filedep . " ";
|
||||
}
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxHTML) {
|
||||
@@ -67,6 +72,10 @@
|
||||
$project{"MSW_HEADERS"} .= "msw/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxOLEINCLUDE) {
|
||||
$project{"MSW_HEADERS"} .= "msw/ole/" . $file . " ";
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxGENERICINCLUDE) {
|
||||
$project{"MSW_HEADERS"} .= "generic/" . $file . " "
|
||||
}
|
||||
@@ -121,6 +130,12 @@ HTMLOBJS = \
|
||||
HTMLDEPS = \
|
||||
#$ ExpandList("HTMLDEPS");
|
||||
|
||||
OLEOBJS = \
|
||||
#$ ExpandList("OLEOBJS");
|
||||
|
||||
OLEDEPS = \
|
||||
#$ ExpandList("OLEDEPS");
|
||||
|
||||
IODBCOBJS = \
|
||||
#$ ExpandList("IODBCOBJS");
|
||||
|
||||
|
||||
@@ -454,7 +454,7 @@ clean: $(PERIPH_CLEAN_TARGET)
|
||||
|
||||
|
||||
# Making documents
|
||||
docs: allhlp allhtml allpdfrtf htb htmlhelp
|
||||
docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
|
||||
alldocs: docs
|
||||
hlp: wxhlp
|
||||
wxhlp: $(DOCDIR)/winhelp/wx.hlp
|
||||
@@ -473,12 +473,12 @@ referencps: $(WXDIR)\docs\ps\referenc.ps
|
||||
allhlp: wxhlp
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc hlp
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc hlp
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
@@ -493,6 +493,22 @@ allhlp: wxhlp
|
||||
allhtml: wxhtml
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc html
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc html
|
||||
cd $(THISDIR)
|
||||
|
||||
allhtmlhelp: htmlhelp
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc htmlhelp
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc htmlhelp
|
||||
cd $(THISDIR)
|
||||
|
||||
allhtb: htb
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc htb
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc htb
|
||||
cd $(THISDIR)
|
||||
|
||||
# nmake -f makefile.vc html
|
||||
@@ -502,8 +518,6 @@ allhtml: wxhtml
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
@@ -514,11 +528,15 @@ allhtml: wxhtml
|
||||
allps: wxps referencps
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc ps
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc ps
|
||||
cd $(THISDIR)
|
||||
|
||||
allpdfrtf: pdfrtf
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.vc pdfrtf
|
||||
cd $(WXDIR)\utils\tex2rtf\src
|
||||
nmake -f makefile.vc pdfrtf
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
|
||||
@@ -28,6 +28,13 @@
|
||||
$file =~ s/cp?p?$/obj/;
|
||||
$project{$tag} .= $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxHTML) {
|
||||
next if $wxHTML{$file} =~ /\b16\b/;
|
||||
|
||||
$file =~ s/cp?p?$/obj/;
|
||||
$project{"WXHTMLOBJS"} .= $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxCommon) {
|
||||
$isCFile = $file =~ /\.c$/;
|
||||
@@ -91,6 +98,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
|
||||
TIFFDIR=$(WXDIR)\src\tiff
|
||||
MSWDIR=$(WXDIR)\src\msw
|
||||
OLEDIR=$(MSWDIR)\ole
|
||||
HTMLDIR=$(WXDIR)\src\html
|
||||
|
||||
DOCDIR = $(WXDIR)\docs
|
||||
|
||||
@@ -106,10 +114,12 @@ COMMONOBJS = &
|
||||
|
||||
MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
|
||||
|
||||
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
|
||||
|
||||
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
|
||||
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
|
||||
|
||||
$(LIBTARGET) : $(OBJECTS)
|
||||
%create tmp.lbc
|
||||
@@ -207,6 +217,23 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
}
|
||||
#$}
|
||||
|
||||
|
||||
########################################################
|
||||
# HTML objects (always compiled)
|
||||
|
||||
#${
|
||||
$_ = $project{"WXHTMLOBJS"};
|
||||
my @objs = split;
|
||||
foreach (@objs) {
|
||||
$text .= $_;
|
||||
s/\.obj$//;
|
||||
$text .= ': $(HTMLDIR)\\';
|
||||
$text .= $_ . ".cpp\n" .
|
||||
' *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
|
||||
}
|
||||
#$}
|
||||
|
||||
|
||||
crbuffri.obj: $(XPMDIR)\crbuffri.c
|
||||
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
item: Install File
|
||||
Source=c:\Windows\System\Msvcirt.dll
|
||||
Source=c:\wx\dlls\winnt\Msvcirt.dll
|
||||
Destination=%SYS32%\Msvcirt.dll
|
||||
Flags=0000010000010011
|
||||
end
|
||||
item: Install File
|
||||
Source=c:\Windows\System\Msvcrt.dll
|
||||
Source=c:\wx\dlls\winnt\Msvcrt.dll
|
||||
Destination=%SYS32%\Msvcrt.dll
|
||||
Flags=0000010000010011
|
||||
end
|
||||
item: Install File
|
||||
Source=c:\Windows\System\Msvcrt.dll
|
||||
Source=c:\wx\dlls\win95\Msvcrt.dll
|
||||
Destination=%SYS%\Msvcrt.dll
|
||||
Flags=0000010000010011
|
||||
end
|
||||
item: Install File
|
||||
Source=c:\Windows\System\Msvcirt.dll
|
||||
Source=c:\wx\dlls\win95\Msvcirt.dll
|
||||
Destination=%SYS%\Msvcirt.dll
|
||||
Flags=0000010000010011
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Document Type: WSE
|
||||
item: Global
|
||||
Version=5.0
|
||||
Title=wxWindows 2.2.3 Installation
|
||||
Title=wxWindows 2.2.6 Installation
|
||||
Flags=00000100
|
||||
Split=1420
|
||||
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
@@ -17,7 +17,7 @@ item: Global
|
||||
Patch Flags=0000000000000001
|
||||
Patch Threshold=85
|
||||
Patch Memory=4000
|
||||
EXE Filename=D:\wx2stable\wxWindows\deliver\setup.exe
|
||||
EXE Filename=c:\wx2stable\wxWindows\deliver\setup.exe
|
||||
FTP Cluster Size=20
|
||||
Variable Name1=_SYS_
|
||||
Variable Default1=C:\WINDOWS\SYSTEM
|
||||
@@ -47,7 +47,7 @@ item: End Block
|
||||
end
|
||||
item: Set Variable
|
||||
Variable=APPTITLE
|
||||
Value=wxWindows 2.2.3
|
||||
Value=wxWindows 2.2.6
|
||||
end
|
||||
item: Set Variable
|
||||
Variable=GROUP
|
||||
@@ -62,7 +62,7 @@ item: Set Variable
|
||||
Value=wx2
|
||||
end
|
||||
item: Display Graphic
|
||||
Pathname=D:\wx2stable\wxWindows\distrib\msw\wxwin01.bmp
|
||||
Pathname=c:\wx2stable\wxWindows\distrib\msw\wxwin01.bmp
|
||||
X Position=16
|
||||
Y Position=16
|
||||
end
|
||||
|
||||
@@ -5,7 +5,7 @@ set dest=%src\deliver
|
||||
set wise=0
|
||||
|
||||
Rem Set this to the required version
|
||||
set version=2.2.4
|
||||
set version=2.2.5
|
||||
|
||||
if "%src" == "" goto usage
|
||||
if "%dest" == "" goto usage
|
||||
@@ -33,7 +33,7 @@ erase %dest\utils.zip
|
||||
erase %dest\extradoc.zip
|
||||
erase %dest\*-win32.zip
|
||||
|
||||
if direxist %dest\wx del /sxyz %dest\wx\
|
||||
if direxist %dest\wx erase /sxyz %dest\wx\
|
||||
|
||||
cd %src
|
||||
echo Zipping...
|
||||
@@ -170,7 +170,7 @@ erase /Y contrib\docs\winhelp\stc.*
|
||||
erase /Y contrib\docs\htmlhelp\mmedia.*
|
||||
erase /Y contrib\docs\htmlhelp\stc.*
|
||||
erase /Y contrib\docs\pdf\*.*
|
||||
del /sxzy contrib\docs\latex\ogl
|
||||
erase /sxzy contrib\docs\latex\ogl
|
||||
erase /Y src\mingegcs.bat
|
||||
erase /Y distrib
|
||||
|
||||
@@ -198,7 +198,7 @@ erase /Y %dest\setup.*
|
||||
rem Now invoke WISE install on the new wxwin2.wse
|
||||
set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
|
||||
echo Invoking %wisecmd...
|
||||
start %wisecmd
|
||||
start "WISE" /w %wisecmd%
|
||||
pause Press any key to continue with the wxWindows distribution...
|
||||
Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\wxMSW-%version%-setup.exe
|
||||
|
||||
|
||||
233
distrib/msw/zipdistinno.bat
Executable file
233
distrib/msw/zipdistinno.bat
Executable file
@@ -0,0 +1,233 @@
|
||||
@echo off
|
||||
rem Zip up an external, generic + Windows distribution of wxWindows 2
|
||||
rem using Inno Setup + ScriptMaker
|
||||
set src=%wxwin
|
||||
set dest=%src\deliver
|
||||
set webfiles=c:\wx2dev\wxWebSite
|
||||
set inno=0
|
||||
|
||||
Rem Set this to the required version
|
||||
set version=2.2.9
|
||||
|
||||
if "%src" == "" goto usage
|
||||
if "%dest" == "" goto usage
|
||||
if "%1" == "-help" goto usage
|
||||
if "%1" == "--help" goto usage
|
||||
if "%1" == "/?" goto usage
|
||||
if "%1" == "innoonly" goto dounzip
|
||||
if "%1" == "inno" set inno=1
|
||||
if "%1" == "tidyup" goto tidyup
|
||||
echo About to archive an external wxWindows distribution:
|
||||
echo From %src
|
||||
echo To %dest
|
||||
if "%inno" == "1" echo with Inno Setup creation.
|
||||
echo CTRL-C if this is not correct.
|
||||
pause
|
||||
|
||||
erase %dest\wx*.zip
|
||||
erase %dest\*.htb
|
||||
erase %dest\ogl3-*.zip
|
||||
erase %dest\tex2rtf2-*.zip
|
||||
erase %dest\jpeg-*.zip
|
||||
erase %dest\tiff-*.zip
|
||||
erase %dest\dialoged-*.zip
|
||||
erase %dest\utils-*.zip
|
||||
erase %dest\extradoc-*.zip
|
||||
erase %dest\*-win32-*.zip
|
||||
|
||||
if direxist %dest\wx erase /sxyz %dest\wx\
|
||||
if not direxist %dest mkdir %dest
|
||||
|
||||
# Copy FAQ and other files from wxWebSite CVS
|
||||
if not direxist %webfiles% echo Error - %webfiles% does not exist
|
||||
if not direxist %webfiles% goto end
|
||||
echo Copying FAQ from %webfiles
|
||||
copy %webfiles%\site\faq*.htm %src\docs\html
|
||||
copy %webfiles%\site\platform.htm %src\docs\html
|
||||
|
||||
cd %src
|
||||
echo Zipping...
|
||||
|
||||
Rem Zip up the complete wxMSW-xxx.zip file
|
||||
Rem NO, do it by unarchiving component files, deleting/copying some files, then
|
||||
Rem rearchiving.
|
||||
Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||
Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||
|
||||
Rem Below is the old-style separated-out format. This is retained only
|
||||
Rem for local use, and for creating wxMSW-xxx.zip.
|
||||
zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
|
||||
zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
|
||||
zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
|
||||
zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
|
||||
zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
|
||||
Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp
|
||||
|
||||
zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
|
||||
zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
|
||||
|
||||
Rem PDF/HTML docs that should go into the Windows setup because
|
||||
Rem there are no WinHelp equivalents
|
||||
zip32 -@ %dest\extradoc-%version%.zip < %src\distrib\msw\extradoc.rsp
|
||||
|
||||
rem VC++ project files
|
||||
zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
|
||||
|
||||
rem BC++ project files
|
||||
zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp
|
||||
|
||||
rem CodeWarrior project files
|
||||
zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
|
||||
|
||||
rem OGL 3
|
||||
zip32 -@ %dest\ogl3-%version%.zip < %src\distrib\msw\ogl.rsp
|
||||
|
||||
rem MMedia
|
||||
zip32 -@ %dest\mmedia-%version%.zip < %src\distrib\msw\mmedia.rsp
|
||||
|
||||
rem STC (Scintilla widget)
|
||||
zip32 -@ %dest\stc-%version%.zip < %src\distrib\msw\stc.rsp
|
||||
|
||||
rem GLCanvas: obsolete, now in main library
|
||||
rem zip32 -@ %dest\glcanvas-%version%.zip < %src\distrib\msw\glcanvas.rsp
|
||||
|
||||
rem Tex2RTF
|
||||
zip32 -@ %dest\tex2rtf2-%version%.zip < %src\distrib\msw\tex2rtf.rsp
|
||||
|
||||
rem JPEG source
|
||||
zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp
|
||||
|
||||
rem TIFF source
|
||||
zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
|
||||
|
||||
rem Dialog Editor source and binary
|
||||
erase %dest\dialoged_source.zip
|
||||
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
|
||||
zip32 -j %dest\dialoged-%version%.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
|
||||
erase %dest\dialoged_source.zip
|
||||
|
||||
rem Misc. utils not in the main distribution
|
||||
zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
|
||||
zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp
|
||||
|
||||
copy %src\docs\changes.txt %dest\changes-%version%.txt
|
||||
copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
|
||||
copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
|
||||
copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
|
||||
copy %src\docs\readme.txt %dest\readme-%version%.txt
|
||||
copy %src\docs\motif\readme.txt %dest\readme_motif-%version%.txt
|
||||
copy %src\docs\gtk\readme.txt %dest\readme_gtk-%version%.txt
|
||||
copy %src\docs\msw\readme.txt %dest\readme_msw-%version%.txt
|
||||
copy %src\docs\readme_vms.txt %dest\readme_vms-%version%.txt
|
||||
copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
|
||||
copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
|
||||
|
||||
Rem Skip Inno Setup if inno is 0.
|
||||
if "%inno" == "0" goto end
|
||||
|
||||
:dounzip
|
||||
|
||||
Rem Make dialoged-win32-%version%.zip and tex2rtf-win32-%version%.zip
|
||||
|
||||
cd %src\bin
|
||||
|
||||
zip32 %dest\dialoged-win32-%version%.zip dialoged.*
|
||||
zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
|
||||
|
||||
cd %dest
|
||||
|
||||
rem Unzip the Windows files into 'wx'
|
||||
mkdir %dest\wx
|
||||
|
||||
Rem After this change of directory, we're in the
|
||||
Rem temporary 'wx' directory and not acting on
|
||||
Rem the source wxWindows directory.
|
||||
cd %dest\wx
|
||||
unzip32 -o ..\wxWindows-%version%-msw.zip
|
||||
unzip32 -o ..\wxWindows-%version%-gen.zip
|
||||
unzip32 -o ..\wxWindows-%version%-vc.zip
|
||||
unzip32 -o ..\wxWindows-%version%-bc.zip
|
||||
unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
|
||||
unzip32 -o ..\extradoc.zip
|
||||
Rem Need Word file, for Remstar DB classes
|
||||
unzip32 -o ..\wxWindows-%version%-Word.zip
|
||||
unzip32 -o ..\ogl3-%version%.zip
|
||||
unzip32 -o ..\jpeg-%version%.zip
|
||||
unzip32 -o ..\tiff-%version%.zip
|
||||
unzip32 -o ..\tex2rtf2-%version%.zip
|
||||
|
||||
rem Now delete a few files that are unnecessary
|
||||
attrib -R *
|
||||
erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms
|
||||
erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in
|
||||
erase /Y setup.h.in setup.h_vms
|
||||
erase /SY Makefile.in
|
||||
erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
|
||||
erase /Y contrib\docs\winhelp\mmedia.*
|
||||
erase /Y contrib\docs\winhelp\stc.*
|
||||
erase /Y contrib\docs\htmlhelp\mmedia.*
|
||||
erase /Y contrib\docs\htmlhelp\stc.*
|
||||
erase /Y contrib\docs\pdf\*.*
|
||||
erase /sxzy contrib\docs\latex\ogl
|
||||
erase /Y src\mingegcs.bat
|
||||
erase /Y distrib
|
||||
|
||||
rem Now copy some binary files to 'bin'
|
||||
if not isdir bin mkdir bin
|
||||
copy %src\bin\dialoged.exe bin
|
||||
copy %src\bin\tex2rtf.exe bin
|
||||
copy %src\bin\dbgview.* bin
|
||||
copy %src\bin\life.exe bin
|
||||
copy %src\demos\life\breeder.lif bin
|
||||
copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
|
||||
copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
|
||||
|
||||
Rem Make wxMSW-xxx.zip
|
||||
zip32 -r ..\wxMSW-%version%.zip *
|
||||
|
||||
rem Time to regenerate the Inno Setup script, wxwin2.iss.
|
||||
rem NB: if you've changed wxwin2.iss using ScriptMaker, call splitinno.exe
|
||||
rem from within distrib\msw, to split off innotop.txt and innobott.txt.
|
||||
rem (NOT YET IMPLEMENTED)
|
||||
echo Calling 'makeinno' to generate wxwin2.iss...
|
||||
call %WXWIN\distrib\msw\makeinno.bat
|
||||
|
||||
erase /Y %dest\setup.*
|
||||
|
||||
rem Now invoke Inno Setup on the new wxwin2.iss
|
||||
set innocmd="C:\Program Files\Inno Setup 1.3\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
|
||||
echo Invoking %innocmd...
|
||||
start "Inno Setup" /w %innocmd%
|
||||
pause Press any key to continue with the wxWindows distribution...
|
||||
Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe
|
||||
|
||||
:tidyup
|
||||
cd %dest
|
||||
|
||||
rem Put all the setup files into a single zip archive.
|
||||
zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup.*
|
||||
|
||||
echo wxWindows archived.
|
||||
|
||||
goto end
|
||||
|
||||
:usage
|
||||
echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
|
||||
echo and optionally makes a deliver2\wx directory and a setup.exe
|
||||
echo if you specify 'inno' (skipping the zipping if you use 'innoonly').
|
||||
echo.
|
||||
echo "Usage: zipdist [inno | innoonly]"
|
||||
|
||||
:end
|
||||
@@ -19,12 +19,12 @@ Compilation
|
||||
a) under Win32 with Visual C++: open the provided wxBase.dsw workspace. From
|
||||
it, you can build wxBase as a static library and/or as a DLL. Please see
|
||||
|
||||
http://www.wxwindows.org/vadim/wxDocs/buildmsw.html
|
||||
http://zeitlin.online.fr/wxWindows/buildmsw.html
|
||||
|
||||
for the instructions on how to use wxBase in your own projects. You can
|
||||
also download the precompiled binaries from
|
||||
|
||||
http://www.wxwindows.org/vadim/wxDocs/binaries.html
|
||||
http://zeitlin.online.fr/wxWindows/binaries.html
|
||||
|
||||
NB: it should be possible to compile wxBase with other compilers as well,
|
||||
if you managed to do this, please let me know so that your makefiles
|
||||
|
||||
@@ -32,7 +32,7 @@ was popped up.
|
||||
wxWINDOWS VERSION: 2.0.1
|
||||
PLATFORM(S): wxMotif
|
||||
DATE IDENTIFIED: ?/?/1998
|
||||
IDENTIFIED BY: Julian Smart <julian.smart@ukonline.co.uk>
|
||||
IDENTIFIED BY: Julian Smart <julian.smart@btopenworld.com>
|
||||
DATE FIXED:
|
||||
FIXED BY:
|
||||
|
||||
@@ -75,7 +75,7 @@ WORKAROUND:
|
||||
wxWINDOWS VERSION: 2.0.1
|
||||
PLATFORM(S): All
|
||||
DATE IDENTIFIED: ?/?/1998
|
||||
IDENTIFIED BY: Julian Smart <julian.smart@ukonline.co.uk>
|
||||
IDENTIFIED BY: Julian Smart <julian.smart@btopenworld.com>
|
||||
DATE FIXED:
|
||||
FIXED BY:
|
||||
|
||||
@@ -244,7 +244,7 @@ WORKAROUND:
|
||||
visitor_email_address: haneef@symphonyeda.com
|
||||
wxWINDOWS+VERSION: 2.1.12
|
||||
DATE+FIXED: 29/11/99
|
||||
FIXED+BY: Julian Smart <julian.smart@ukonline.co.uk>
|
||||
FIXED+BY: Julian Smart <julian.smart@btopenworld.com>
|
||||
|
||||
DATE+FIXED:
|
||||
DATE+IDENTIFIED: 29/11/1999
|
||||
|
||||
121
docs/changes.txt
121
docs/changes.txt
@@ -13,19 +13,134 @@ wxMSW:
|
||||
OTHER CHANGES
|
||||
-------------
|
||||
|
||||
2.2.9
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- several memory leaks fixed, a few speed optimizations were done
|
||||
- using wxURL now enforces linking HTTP and FTP protocols in
|
||||
|
||||
Unix:
|
||||
|
||||
- configure changes: the system libraries are now used if found, fixes for
|
||||
configuring under Solaris and Mac OS X, better support for 64 bit
|
||||
architectures (including IA64)
|
||||
|
||||
- call dlopen() with RTLD_GLOBAL flag
|
||||
|
||||
- wxBase:
|
||||
|
||||
- fixed bugs in wxString::rfind() and resize()
|
||||
- fixed wxStrtok()
|
||||
- miscellaneous fixes in wxDateTime
|
||||
- bug fixes in wxODBC
|
||||
|
||||
wxMSW:
|
||||
|
||||
- fixed wxChoice size calculations
|
||||
- fixed bad resource leak in wxListBox
|
||||
- fixed crash in wxSetFocusToChild()
|
||||
- fixed toolbar buttons drawing under Windows 2000
|
||||
- significant speed optimizations in wxRegConfig
|
||||
- better handling of accelerators
|
||||
- wxComboBox can now process enter key and sends TEXT_UPDATED more often
|
||||
- fixed crashes with big XPM files
|
||||
- compilation fixes for Mingw32/JPEG code
|
||||
|
||||
wxGTK:
|
||||
|
||||
- fix for non-US keyboards
|
||||
- improvents for 8bpp displays
|
||||
- various wxComboBox fixes
|
||||
- corrected radio button event sending
|
||||
- fixed slider value rounding, wxGA_VERTICAL style is now supported
|
||||
- fixed tree control invalid pointer after drag bug
|
||||
|
||||
2.2.8
|
||||
-----
|
||||
|
||||
There was no official wxWindows 2.2.8 release.
|
||||
|
||||
2.2.7
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- significant speed optimizations in several classes
|
||||
- wxFont::operator==() fixed
|
||||
|
||||
Unix:
|
||||
|
||||
- support for OpenBSD added to configure (Dennis Taylor)
|
||||
|
||||
wxBase:
|
||||
|
||||
- wxLongLong compilation fixed for SGI native compiler
|
||||
- wxString::FormatV() fatal bug fixed
|
||||
|
||||
wxMSW:
|
||||
|
||||
- wxExecute DDE bug corrected: no spurious error messages any more
|
||||
- wxMSW focus handling problems (notable with toolbars and splitters) fixed
|
||||
- wxListCtrl attributes are handled correctly when inserting/deleting/sorting
|
||||
- wxPrinterDC resource leak fixed
|
||||
- fixed paper size handling when printer device driver reports DM_PAPERSIZE with
|
||||
dmPaperSize >= DMPAPER_USER
|
||||
- implemented renaming of wxRegConfig groups
|
||||
|
||||
wxGTK:
|
||||
|
||||
- wxToolbar::InsertSeparator() fixed
|
||||
- foreign (non US) characters input problem fixed
|
||||
- assorted wxActivateEvent fixes
|
||||
|
||||
wxHTML:
|
||||
|
||||
- fixed parsing of à
|
||||
|
||||
2.2.6
|
||||
-----
|
||||
|
||||
wxBase:
|
||||
|
||||
- fixed problem with wxURL when using static version of the library
|
||||
- crash when reading certain malformed mailcap entries under Unix fixed
|
||||
- memory/resource leak in wxSocket::Accept() fixed (Kruba Fabien)
|
||||
|
||||
All (GUI):
|
||||
|
||||
- Spanish translations added (Luis Pa<50>l Tomillo)
|
||||
- bug in wxDocMDIParentFrame::OnMRUFile() fixed
|
||||
- wxYieldIfNeeded added, to ignore yield recursion.
|
||||
|
||||
wxMSW:
|
||||
|
||||
- wxChoice sizing bug introduced in 2.2.5 fixed (oops) and calculating of
|
||||
the size of initially empty wxChoice controls fixed as well
|
||||
- bug with negative coordinates being turned into huge positive ones in
|
||||
EVT_MOVE fixed (Imad Jureidini)
|
||||
- jpeg library compilation fixed for newer versions of mingw32 and cygwin
|
||||
- controls which don't accept focus don't get it on left mouse click
|
||||
- wxToolBar::DeleteTool() in presence of toolbar controls fixed
|
||||
- wxDC::DeviceToLogical[XY] fixed (Chuck Messenger)
|
||||
|
||||
wxGTK:
|
||||
|
||||
- fixed configure bug: it didn't define HAVE_VSNPRINTF properly always
|
||||
- wxGauge now supports wxGA_VERTICAL (Shane Forsythe)
|
||||
- fixed keyboard input in wxSpinCtrl
|
||||
|
||||
wxHTML:
|
||||
|
||||
- fixed bug in parsing tags with whitespaces around '=' in tags,
|
||||
e.g. <a href = "something.html">
|
||||
|
||||
2.2.5
|
||||
-----
|
||||
|
||||
- fixed memory corruption/crash in wxStreamBuffer
|
||||
- wxTree/ListCtrl position fix (Mike Oliver <oliver@math.ucla.edu>)
|
||||
- wxTree/ListCtrl position fix (Mike Oliver)
|
||||
- Italian translations updated
|
||||
- Windows 2000 toolbar colours problem fixed
|
||||
|
||||
@@ -59,7 +174,7 @@ wxBase:
|
||||
- wxDB: replaced German variable names with English.
|
||||
- wxDbGetConnection() did not check for the correct scrolling
|
||||
of cursors when re-using a cached database connection.
|
||||
|
||||
|
||||
All (GUI):
|
||||
|
||||
- Corrected uninitialized variable in wxDocument constructor.
|
||||
@@ -298,7 +413,7 @@ wxHTML:
|
||||
|
||||
- almost complete rewrite of wxHtmlHelpController,
|
||||
including faster search, bookmarks, printing, setup dialog
|
||||
and cross-platform binary compatible .cached files for faster
|
||||
and cross-platform binary compatible .cached files for faster
|
||||
loading of large helpbooks, case insensitive search
|
||||
splitted into 3 parts: wxHtmlHelpData, Frame and Controller
|
||||
- added support for charsets and <meta> tag
|
||||
|
||||
@@ -4,6 +4,26 @@ ports.
|
||||
|
||||
*** next release ***
|
||||
|
||||
*** 22th May 2001: wxWindows 2.2.7 released ***
|
||||
|
||||
Applied patch to allow using non-Latin keyboards.
|
||||
|
||||
Added wxActivateEvent for top level windows.
|
||||
|
||||
Corrected wxActivateEvent for app (now wxEVT_ACTIAVTE_APP).
|
||||
|
||||
wxTextCtrl sends focus events.
|
||||
|
||||
Corrected so-library name.
|
||||
|
||||
wxTreeCtrl now shows an item, if it was programmatically selected.
|
||||
|
||||
wxTextCtrl no longer sends any text event upon its construction.
|
||||
|
||||
wxSpinCtrl misbehaviour fixed.
|
||||
|
||||
*** 7th March 2001: wxWindows 2.2.6 released ***
|
||||
|
||||
wxWakeUpIdle() works again
|
||||
|
||||
wxGauge now supports wxGA_VERTICAL (Shane Forsythe)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
<HTML>
|
||||
|
||||
<HEAD>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
<HTML>
|
||||
|
||||
<HEAD>
|
||||
@@ -22,22 +23,38 @@ wxWindows 2 FAQ: General
|
||||
|
||||
See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<hr>
|
||||
<h3>List of questions in this category</h3>
|
||||
<ul>
|
||||
<li><a href="#whatis">What is wxWindows?</a></li>
|
||||
<li><a href="#users">Who uses wxWindows?</a></li>
|
||||
<li><a href="#platforms">What platforms are supported by wxWindows 2?</a></li>
|
||||
<li><a href="#specific">How does wxWindows 2 support platform-specific features?</a></li>
|
||||
<li><a href="#stl">Does wxWindows use STL? or the standard string class?</a></li>
|
||||
<li><a href="#richedit">Is there a rich edit/markup widget for wxWindows 2?</a></ li>
|
||||
<li><a href="#dev">How is wxWindows 2 being developed?</a></li>
|
||||
<li><a href="#distrib">How is wxWindows 2 distributed?</a></li>
|
||||
<li><a href="#future">What are the plans for the future?</a></li>
|
||||
<li><a href="#univ">What is wxUniversal?</a></li>
|
||||
<li><a href="#jave">What about Java?</a></li>
|
||||
<li><a href="#help">How can I help the project?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
|
||||
<H3><a name="whatis">What is wxWindows?</a></H3>
|
||||
|
||||
wxWindows is a class library that allows you to compile graphical C++ programs on a range of
|
||||
different platforms. wxWindows defines a common API across platforms, but uses the native graphical user interface (GUI) on each platform,
|
||||
so your program will take on the native 'look and feel' that users are familiar with.<P>
|
||||
so your program will take on the native 'look and feel' that users are familiar with.<P>
|
||||
|
||||
Although GUI applications are mostly built programmatically, there is a dialog editor to help
|
||||
build attractive dialogs and panels. Robert Roebling's <a href="http://www.roebling.com">wxDesigner</a>
|
||||
build attractive dialogs and panels. Robert Roebling's <a href="http://www.roebling.com">wxDesigner</a>
|
||||
makes light work of resizable, portable dialogs.<P>
|
||||
|
||||
You don't have to use C++ to use wxWindows: wxWindows 1 has been interfaced to several interpreted languages,
|
||||
such as CLIPS, Python, Scheme, XLisp and Perl, and there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2.
|
||||
You don't have to use C++ to use wxWindows: there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2,
|
||||
and also a <a href="http://wxperl.sourceforge.net" target=_top>Perl interface</a>.
|
||||
<P>
|
||||
|
||||
<h3>Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL'ed projects?</h3>
|
||||
<h3>Can I use wxWindows 2 for both proprietary (commercial) projects, and GPL'ed projects?</h3>
|
||||
|
||||
Yes. Please see the <a href="newlicen.htm">licence</a> for details, but basically
|
||||
you can distribute proprietary binaries without distributing any source code, and neither will wxWindows
|
||||
@@ -57,7 +74,7 @@ keen to fix bugs as soon as possible, though obviously there are no guarantees.
|
||||
<H3><a name="users">Who uses wxWindows?</a></H3>
|
||||
|
||||
Many organisations - commercial, government, and academic - across the
|
||||
world. It's impossible to estimate the true number of users, since
|
||||
world. It's impossible to estimate the true number of users, since
|
||||
wxWindows is obtained by many different means, and we cannot monitor
|
||||
distribution. The mailing list contains around 300-400 entries which is
|
||||
quite large for a list of this type.<P>
|
||||
@@ -65,62 +82,28 @@ quite large for a list of this type.<P>
|
||||
See <a href="users.htm">Users</a> for a list of some users and their applications, and
|
||||
also <A href="feedback.htm">Feedback</a> for comments.<P>
|
||||
|
||||
<H3>How much has the API changed since 1.xx?</H3>
|
||||
|
||||
It's difficult to summarize, but some aspects haven't changed very much. For example, if you have some
|
||||
complex drawing code, you will mostly need to make sure it's parameterised with a device
|
||||
context (instead of obtaining one from a window or storing it). You won't have
|
||||
to completely rewrite the drawing code.<P>
|
||||
|
||||
The way that events are handled has changed, so for example, where you overrode
|
||||
OnSize before, you now have a non-virtual OnSize with a single event class argument.
|
||||
To make this function known to wxWindows, you add an entry in an 'event table' using macros. Addition of these macros
|
||||
will eventually be made easier by a tool which will allow selection from a list
|
||||
and copy-and-paste into your editor. This is extended to button presses, listbox selection
|
||||
etc. so callbacks have gone (they may be added back for limited backward compatibility).<P>
|
||||
|
||||
The class hierarchy has changed to allow greater flexibility but it probably won't affect your
|
||||
existing application. One exception to this is MDI applications which now use separate MDI classes instead of style
|
||||
flags. As a result, it won't be possible to switch between MDI and SDI operation at run-time
|
||||
without further coding, but a benefit is less interdependence between areas of code,
|
||||
and therefore smaller executable size.<P>
|
||||
|
||||
Panel items (now called controls) no longer have labels associated with most of them,
|
||||
and default panel layout has been removed. The idea is that you make greater use
|
||||
of dialog resources, for better-looking dialogs.<P>
|
||||
|
||||
<H3>What classes have disappeared?</H3>
|
||||
|
||||
wxForm, wxTextWindow (subsumed into wxTextCtrl).
|
||||
|
||||
<H3>Does wxWindows 2 mean that wxWindows 1.xx is dead?</H3>
|
||||
|
||||
While wxWindows 2 is being developed, there will be further patches to wxWindows 1.xx.
|
||||
Obviously we are investing most of our energy into the new code, but we're also trying
|
||||
to fix bugs in the current version.<P>
|
||||
|
||||
<H3>What platforms are supported by wxWindows 2?</H3>
|
||||
<H3><a name="platforms">What platforms are supported by wxWindows 2?</a></H3>
|
||||
|
||||
<ul>
|
||||
<li>Windows 3.1, Windows 95/98, Windows NT;
|
||||
<li>Linux and other Unix platforms with GTK+;
|
||||
<li>Unix with Motif or the free Motif clone Lesstif;
|
||||
<li>Mac;
|
||||
<li>A BeOS port is being investigated.
|
||||
<li>A Windows CE port is being investigated.
|
||||
<li>Windows 3.1, Windows 95/98, Windows NT, Windows 2000, Windows ME.
|
||||
<li>Linux and other Unix platforms with GTK+.
|
||||
<li>Unix with Motif or the free Motif clone Lesstif.
|
||||
<li>Mac OS.
|
||||
<li>Embedded platforms are being investigated. See the <a href="wxuniv.htm">wxUniversal</a> project.
|
||||
<li>An OS/2 port is in progress, and you can also compile wxWindows for GTK+ or Motif
|
||||
on OS/2.
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<H3>How does wxWindows 2 support platform-specific features?</H3>
|
||||
<H3><a name="specific">How does wxWindows 2 support platform-specific
|
||||
features?</a></H3>
|
||||
|
||||
This is a hotly-debated topic amongst the developers. My own philosophy
|
||||
is to make wxWindows as platform-independent as possible, but allow in a
|
||||
few classes (functions, window styles) that are platform-specific.
|
||||
For example, Windows metafiles and Windows 95 taskbar icons have
|
||||
their own classes on Windows, but nowhere else. Because these classes
|
||||
are provided and are wxWindows-compatible, it doesn't take much
|
||||
are provided and are wxWindows-compatible, it doesn't take much
|
||||
coding effort for an application programmer to add support for
|
||||
some functionality that the user on a particular platform might otherwise
|
||||
miss. Also, some classes that started off as platform-specific, such
|
||||
@@ -128,24 +111,24 @@ as the MDI classes, have been emulated on other platforms. I can imagine
|
||||
that even wxTaskBarIcon may be implemented for Unix desktops one day.
|
||||
<P>
|
||||
|
||||
In other words, wxWindows is not a 'lowest common denominator' approach,
|
||||
In other words, wxWindows is not a 'lowest common denominator' approach,
|
||||
but it will still be possible to write portable programs using the
|
||||
core API. Forbidding some platform-specific classes would be a stupid
|
||||
approach that would alienate many potential users, and encourage
|
||||
the perception that toolkits such as wxWindows are not up to the demands
|
||||
of today's sophisticated applications.<P>
|
||||
of today's sophisticated applications.<P>
|
||||
|
||||
Currently resources such as bitmaps and icons are handled in a platform-specific
|
||||
way, but it is hoped to reduce this dependence in due course.<P>
|
||||
|
||||
Another reason why wxWindows 2 is not a 'lowest common denominator' toolkit is that
|
||||
Another reason why wxWindows 2 is not a 'lowest common denominator' toolkit is that
|
||||
some functionality missing on some platform has been provided using generic,
|
||||
platform-independent code, such as the wxTreeCtrl and wxListCtrl classes.<P>
|
||||
|
||||
<H3>Does wxWindows use STL? or the standard string class?</H3>
|
||||
<H3><a name="stl">Does wxWindows use STL? or the standard string class?</a></H3>
|
||||
|
||||
No. This is a much-discussed topic that has (many times) ended with the conclusion that it is in
|
||||
wxWindows' best interests to avoid use of templates. Not all compilers can handle
|
||||
wxWindows' best interests to avoid use of templates. Not all compilers can handle
|
||||
templates adequately so it would dramatically reduce the number of compilers
|
||||
and platforms that could be supported. It would also be undersirable to make
|
||||
wxWindows dependent on another large library that may have to be downloaded and installed.
|
||||
@@ -158,9 +141,20 @@ by being able to modify our own string class. Some compatibility with the string
|
||||
has been built into wxString.<P>
|
||||
|
||||
There is nothing to stop an application using templates or the string class for its own
|
||||
purposes.<P>
|
||||
purposes. With wxWindows debugging options on, you may find you get errors when including
|
||||
STL headers. You can work around it either by switching off memory checking,
|
||||
or by adding this to a header before you include any STL files:<P>
|
||||
|
||||
<H3>Is there a rich edit/markup widget for wxWindows 2?</H3>
|
||||
<PRE>
|
||||
#ifdef new
|
||||
#undef new
|
||||
#endif
|
||||
</PRE>
|
||||
|
||||
<P>
|
||||
|
||||
|
||||
<H3><a name="richedit">Is there a rich edit/markup widget for wxWindows 2?</a></H3>
|
||||
|
||||
These are the possibilities so far:<P>
|
||||
|
||||
@@ -173,12 +167,12 @@ for this widget.
|
||||
then wxHTML will suit your needs. wxHTML is built into wxWindows - please see the reference
|
||||
manual for details, and samples/html.
|
||||
<li>There are rich edit widgets in both WIN32 and GTK+, but there is currently
|
||||
no wxWindows wrapper for these.
|
||||
no wxWindows wrapper for these (but text attribute functions are being added in the wxWindows 2.3.x series).
|
||||
</ul>
|
||||
|
||||
<P>
|
||||
|
||||
<H3>How is wxWindows 2 being developed?</H3>
|
||||
<H3><a name="dev">How is wxWindows 2 being developed?</a></H3>
|
||||
|
||||
We are using the <a href="cvs.htm">CVS</a> system to develop and maintain wxWindows. This allows
|
||||
us to make alterations and upload them instantly to the SourceForge server, from
|
||||
@@ -187,20 +181,24 @@ which others can update their source.<P>
|
||||
To build source from CVS, see the file BuildCVS.txt in the top-level wxWindows distribution
|
||||
directory.<P>
|
||||
|
||||
<H3>How is wxWindows 2 distributed?</H3>
|
||||
<H3><a name="distrib">How is wxWindows 2 distributed?</a></H3>
|
||||
|
||||
By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.<P>
|
||||
By ftp, and via the <a href="cdrom2.htm">wxWindows CD-ROM</a>.
|
||||
<P>
|
||||
If you are feeling adventurous, you may also check out the sources directly
|
||||
from the <a href="cvs.htm">cvs</a>
|
||||
<p>
|
||||
|
||||
<H3>What are the plans for the future?</H3>
|
||||
<H3><a name="future">What are the plans for the future?</a></H3>
|
||||
|
||||
Currently we're working too hard on getting wxWindows 2 finished (are GUI toolkits ever
|
||||
Currently we're working too hard on getting wxWindows 2 finished (are GUI toolkits ever
|
||||
finished?) to think very far ahead. However, we know we want to make wxWindows as robust
|
||||
and well-publicised as possible. We also want to aim for better platform-independence of
|
||||
resources such as icons and bitmaps, standardising on the PNG for all platforms.<P>
|
||||
|
||||
Other possibilities include: DCOM/CORBA compatibility; a wxWindows book;
|
||||
<a href="http://wxstudio.linuxbox.com/">wxStudio</a>, an IDE;
|
||||
other platforms; other interface abilities such as speech output.<P>
|
||||
<a href="http://wxworkshop.sourceforge.net/">wxWorkshop</a>, an IDE;
|
||||
other platforms, especially embedded systems; other interface abilities such as speech output.<P>
|
||||
|
||||
We will investigate the possibility of compiler or operating system vendors bundling wxWindows with
|
||||
their product.<P>
|
||||
@@ -208,17 +206,28 @@ their product.<P>
|
||||
The high-level goal of wxWindows is to be thought of as the number one C++ framework,
|
||||
for virtually any platform. Move over, MFC!<P>
|
||||
|
||||
<H3>What about Java?</H3>
|
||||
<H3><a name="univ">What is wxUniversal?</a></H3>
|
||||
|
||||
wxUniversal is a new port of wxWindows being currently actively developed. The
|
||||
main difference is that wxUniversal implements all controls (or widgets) in
|
||||
wxWindows itself thus allowing to have much more flexibility (i.e. support for
|
||||
themes even under MS Windows!). It also means that it is now much easier to
|
||||
port wxWindows to a new platform as only the low-level classes must be ported
|
||||
which make for a small part of the library.
|
||||
<p>
|
||||
You may find more about wxUniversal <a href=wxuniv.htm>here</a>.
|
||||
|
||||
<H3><a name="jave">What about Java?</a></H3>
|
||||
|
||||
The Java honeymoon period is over :-) and people are realising that it cannot
|
||||
meet all their cross-platform development needs. We don't anticipate a major threat
|
||||
meet all their cross-platform development needs. We don't anticipate a major threat
|
||||
from Java, and the level of interest in wxWindows is as high as ever.<P>
|
||||
|
||||
<H3>How can I help the project?</H3>
|
||||
<H3><a name="help">How can I help the project?</a></H3>
|
||||
|
||||
Please check out the <a href="http://www.wxwindows.org/develop.htm" target=main>Backroom</a> pages,
|
||||
in particular the <a href="http://www.wxwindows.org/projects.htm">suggested projects</a>, and
|
||||
mail <a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a> or the developers' mailing list with your own suggestions.<P>
|
||||
Please check out the <a href="http://www.wxwindows.org/develop2.htm">Community</a> pages,
|
||||
in particular the <a href="projects.htm">suggested projects</a>, and
|
||||
mail <a href="mailto:julian.smart@btopenworld.com">Julian Smart</a> or the developers' mailing list with your own suggestions.<P>
|
||||
|
||||
</font>
|
||||
|
||||
|
||||
@@ -22,23 +22,36 @@ wxWindows 2 for GTK FAQ
|
||||
|
||||
See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<hr>
|
||||
|
||||
<h3>What is wxWindows 2 for GTK?</h3>
|
||||
<h3>List of questions in this category</h3>
|
||||
<li><a href="#wxgtk">What is wxWindows 2 for GTK?</a></li>
|
||||
<li><a href="#gnome">Does wxGTK have GNOME support?</a></li>
|
||||
<li><a href="#redhat">Warning about GTK libraries supplied with RedHat</a></li>
|
||||
<li><a href="#wxgtk">What is wxWindows 2 for GTK?</a></li>
|
||||
<hr>
|
||||
|
||||
wxWindows 2 for GTK is a port of wxWindows to the <a href="http://www.gimp.org/gtk" target=_top>GTK+ toolkit</a>,
|
||||
which is freely available for most flavours of Unix with X. wxWindows 2 for GTK is
|
||||
often abbreviated to wxGTK. wxGTK has a separate home page <a href="http://www.freiburg.linux.de/~wxxt" target=_top>here</a>.
|
||||
<P>
|
||||
|
||||
<h3>Does wxGTK have GNOME support?</h3>
|
||||
<h3><a name="gnome">Does wxGTK have GNOME support?</a></h3>
|
||||
|
||||
Currently wxGTK does not have any features that would involve dependence on any desktop
|
||||
environment's libraries, so it can work on GNOME, KDE and with other window managers
|
||||
environment's libraries, so it can work on GNOME, KDE and with other window managers
|
||||
without installation hassles. Some GNOME and KDE integration features are file based, and
|
||||
so may be added without dependence on libraries. Other features may be supported in the
|
||||
future, probably as a separate library.
|
||||
<P>
|
||||
|
||||
<h3><a name="redhat">Warning about GTK libraries supplied with RedHat</a></h3>
|
||||
|
||||
It seems that some versions of RedHat include a badly patched version of GTK (not wxGTK)
|
||||
which causes some trouble with wxWindows' socket code. Common symptoms are that when
|
||||
a client tries to establish a connection to an existing server which refuses the request,
|
||||
the client will get notified twice, first getting a LOST event and then a CONNECT event.
|
||||
This problem can be solved by updating GTK with an official distribution of the library.
|
||||
<P>
|
||||
|
||||
|
||||
</font>
|
||||
|
||||
|
||||
@@ -22,12 +22,194 @@ wxWindows 2 for Mac FAQ
|
||||
|
||||
See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<hr>
|
||||
<h3>List of questions in this category</h3>
|
||||
<ul>
|
||||
<li><a href="#release">When is wxMac 2.x due to be released?</a></li>
|
||||
<li><a href="#macplat">Which Mac platforms are supported?</a></li>
|
||||
<li><a href="#macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></li>
|
||||
<li><a href="#macclassic">How are improvements to the Classic Mac OS port integra ted into the Mac OS X port?</a></li>
|
||||
<li><a href="#compilers">What compilers are supported?</a></li>
|
||||
<li><a href="#filetypes">How does CVS handle file types/creators under Mac OS 8.x /9.x?</a></li>
|
||||
<li><a href="#filetypesx">How does CVS handle file types/creators under Mac OS X? </a></li>
|
||||
<li><a href="#cwpro53">What steps are required to build wxMac using CodeWarrior P ro 5.3?</a></li>
|
||||
<li><a href="#buildx">What steps are required to build wxMac under Mac OS X?</a></li>
|
||||
<li><a href="#settings">What important settings are required in the CodeWarrior P roject Preferences?</a></li>
|
||||
<li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
|
||||
<li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
<h3><a name="release">When is wxMac 2.x due to be released?</a></h3>
|
||||
|
||||
<h3>When is wxMac 2 due to be released?</h3>
|
||||
There is a <a href="dl_mac2.htm">preview</a> available.
|
||||
The author of this port is <a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>.
|
||||
<P>
|
||||
|
||||
There is a <a href="http://www.wxwindows.org/dl_mac2.htm">preview</a> available.
|
||||
A beta release can be expected by early Q2 1999. The author of this port
|
||||
is Stefan Csomor (csomor@advancedconcepts.ch).
|
||||
<table border=0 cellpadding=5>
|
||||
<tr>
|
||||
<td bgcolor="#C4ECF9">
|
||||
<FONT FACE="Arial, Lucida Sans, Helvetica">
|
||||
<font size=2>
|
||||
Please note that the version of wxMac in CVS is more robust and nearly feature-complete compared with the packaged 2.0 release.
|
||||
Until a new release is made, it is recommended that you download the wxMac 2.3.1 <a href="dl_mac2.htm#dev">development snapshot</a> or the sources from the <a href="cvs.htm">CVS trunk</a>.
|
||||
</font>
|
||||
</font></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<P>
|
||||
|
||||
<h3><a name="macplat">Which Mac platforms are supported?</a></h3>
|
||||
|
||||
wxWindows 2 can be used to develop and deliver applications on Classic Mac OS (e.g. Mac OS 8.x/9.x) both as Carbon and non-Carbon applications.
|
||||
<P>
|
||||
A Mac OS X port is in progress in order to be able to build wxWindows applications using the Apple Developer Tools that are delivered with every copy of Mac OS X.
|
||||
The Mac OS X port is based on and, for the most part, merged with the Carbon code for Classic Mac OS.
|
||||
<P>
|
||||
|
||||
<h3><a name="macosx">How is the Mac OS X port different from the Classic Mac OS port?</a></h3>
|
||||
|
||||
wxMac for Mac OS X shares code both with wxMac for Mac OS and common Unix code in wxWindows. The aim is to use the same Mac OS Carbon code both for Classic Mac OS and for Mac OS X while leveraging the fact that Mac OS X is a BSD Unix.
|
||||
<P>
|
||||
This hybrid approach was suggested by Apple to the <a href="http://www.mozilla.org/ports/fizzilla/">Fizzilla</a> team working on <a href="http://www.mozilla.org/">Mozilla</a> for Mac OS X.
|
||||
<P>
|
||||
|
||||
<h3><a name="macclassic">How are improvements to the Classic Mac OS port integrated into the Mac OS X port?</a></h3>
|
||||
|
||||
Since the source code is shared between the two ports, any Carbon compliant improvements to wxMac for Classic Mac OS are automatically available in the Mac OS X port.
|
||||
<P>
|
||||
The following points should be considered when improving wxMac:
|
||||
<ul>
|
||||
<li>Non Carbon compliant changes for Classic Mac OS will most likely break the Mac OS X port. <em>Such changes should be tested using the Carbon targets in the CodeWarrior projects for Classic Mac OS.</em>
|
||||
<li>Non Carbon compliant changes for Mac OS X will most likely break the Classic Mac OS port. <em>Such changes should be tested using CodeWarrior under Mac OS 8.x/9.x.</em>
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<h3><a name="compilers">What compilers are supported?</a></h3>
|
||||
|
||||
Under Classic Mac OS, MetroWerks CodeWarrior Pro 5.3 or 6 are required to build wxMac.
|
||||
<P>
|
||||
Under Mac OS X, the Developer Tools are sufficient to build wxMac. CodeWarrior Pro 6 can also be used to build the Carbon targets.
|
||||
<P>
|
||||
|
||||
<h3><a name="filetypes">How does CVS handle file types/creators under Mac OS 8.x/9.x?</a></h3>
|
||||
|
||||
Before checking out the wxWindows code using a CVS client under Mac OS 8.x/9.x, be sure your computer is set up to treat <code>xpm</code> and <code>xbm</code> images correctly:
|
||||
<ul>
|
||||
<li>bring up the Internet control panel, select the <i>Advanced Options</i> tab, click on the <i>File Mapping</i> icon from the list at the left and see if there are is an entry for ".xpm" files and another for ".xbm".
|
||||
<li>if an entry exists, click <i>Change...</i> and make sure <i>File Type</i> is <code>TEXT</code> (just those four capital letters); correct it if necessary. If there is no entry, make one with type set to <code>TEXT</code> and creator set to anything you like; reasonable choices include <code>GKON</code> (Graphic Converter) or <code>CWIE</code> (CodeWarrior).
|
||||
<li>if you want to edit <code>xpm</code> or <code>xbm</code> files in CodeWarrior, set up a file mapping in the CodeWarrior project settings for analogous to ".h" files.
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<h3><a name="filetypesx">How does CVS handle file types/creators under Mac OS X?</a></h3>
|
||||
|
||||
The Mac OS X CVS client does not handle file types and creators at all (just like every Unix command line CVS client). This is an issue only when the checked out files will also be used under Mac OS 8.x/9.x.
|
||||
<P>
|
||||
All files checked out under Mac OS X will be untyped and CodeWarrior will not recognize them correctly. To correct this, use the autotyper provided in the CVS sources:
|
||||
<ul>
|
||||
<li>decode and decompress the file <code>wxWindows/docs/mac/TypeAsMetrowerksText.sea.hqx</code>
|
||||
<li>drag the wxWindows CVS sandbox directory onto the autotyper and most of the files will be typed according to the file extension
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<h3><a name="cwpro53">What steps are required to build wxMac using CodeWarrior Pro 5.3?</a></h3>
|
||||
|
||||
The latest build for Carbon support lead to a few changes that you will have to follow in order to successfully compile the code.
|
||||
This is also necessary even if you don'want to build the Carbon targets.
|
||||
|
||||
<ol>
|
||||
<li>you need CodeWarrior Pro 5.3, i.e. 5.0 with all the upgrades
|
||||
<li>you have to download the Universal Interfaces 3.3.2 or later from the Apple Developer web site, Universal Interfaces 3.4 is required for Carbon Printing support
|
||||
<li>put the Universal folder into the MacOS Support folder and replace older versions
|
||||
<li>remove from the MacOS Support folder the separate OpenTransport folder
|
||||
<li>open the file MacOS Support:MacHeaders:MacHeaders.c and add the line
|
||||
<pre>#include <ControlDefinitions.h></pre>
|
||||
after the line
|
||||
<pre>#include <Controls.h></pre>
|
||||
<li>rebuild all MacHeaders from the MacHeaders.mcp project in the same folder
|
||||
</ol>
|
||||
<P>
|
||||
Build the projects (<code>makemac6.mcp</code> for CodeWarrior Pro 6; <code>makemac.mpc</code> for CodeWarrior Pro 5) in the following five directories:
|
||||
<ul>
|
||||
<li>wxWindows:src:
|
||||
<li>wxWindows:src:jpeg:
|
||||
<li>wxWindows:src:png:
|
||||
<li>wxWindows:src:tiff:
|
||||
<li>wxWindows:src:zlib:
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<h3><a name="buildx">What steps are required to build wxMac under Mac OS X?</a></h3>
|
||||
|
||||
You need to have the Apple Developer Tools installed. The Developer Tools CD is one of the 3 CDs that are delivered with Mac OS X but must be installed in addition to the default Mac OS X installation.
|
||||
<P>
|
||||
Building wxMac completely without configure is not supported.
|
||||
<P>
|
||||
Building wxWindows directly in the CVS sandbox is not recommended. Instead, wxWindows should be built in a directory configured relatively to the CVS sandbox.
|
||||
For instance, to build wxMac with configure, start in the base wxWindows directory and type:
|
||||
<ul>
|
||||
<li><code>mkdir macbuild</code>
|
||||
<li><code>cd macbuild</code>
|
||||
<li><code>../configure</code> <b>or</b> <code>../configure --enable-debug</code>
|
||||
<li><code>make</code>
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
<h3><a name="settings">What important settings are required in the CodeWarrior Project Preferences?</a></h3>
|
||||
|
||||
For some reasons the CodeWarrior project settings may get changed and this may lead to the inability to compile a certain target. In order to verify the settings click on the target tab, double click on the respective target and then select the following items on the tree-view on the left. Here are the important checks:
|
||||
|
||||
<ol>
|
||||
|
||||
<li>under <code>Target/Access Paths</code>, make sure the first user include does not have a folder icon for recursive search.
|
||||
|
||||
<li> under <code>Language Settings/C/C++ Language</code>, make sure that the only checked items are:
|
||||
<ul>
|
||||
<li><code>Enable C++ Exceptions</code>
|
||||
<li><code>Enable RTTI</code>
|
||||
<li><code>Enable bool Support</code>
|
||||
<li><code>Enable wchar_t Support</code>
|
||||
<li><code>Relaxed Pointer Type Rules</code>
|
||||
<li><code>Use Unsigned Chars</code>
|
||||
</ul>
|
||||
|
||||
<li>under <code>Language Settings/C/C++ Warnings</code>, make sure that the only checked items are:
|
||||
<ul>
|
||||
<li><code>Illegal Pragmas</code>
|
||||
<li><code>Extended Error Checking</code>
|
||||
<li><code>Inconsistent Use of 'class' and 'struct' Keywords</code>
|
||||
<li><code>Hidden Virtual Functions</code> but be aware that the framework itself has some of these beauty spots
|
||||
</ul>
|
||||
|
||||
<li>under <code>Linker/PPC Linker</code>, make sure that the following items are checked:
|
||||
<ul>
|
||||
<li><code>Dead-strip Static Initialization Code</code> in order to avoid including libraries that are not needed, especially as things like <a href="http://developer.apple.com/opengl/index.html">OpenGL</a> get added to the projects and sources
|
||||
</ul>
|
||||
|
||||
</ol>
|
||||
<P>
|
||||
|
||||
<h3><a name="smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></h3>
|
||||
|
||||
Smart preprocessing is activated with the <code>-cpp-precomp</code> option and allows much faster preprocessing of the source files by loading precompiled Carbon header files. This option speeds up the compilation of wxMac by a factor of 2 at least.
|
||||
When compiling wxMac using the Apple Developer Tools, the following error is displayed for certain files:
|
||||
<ul>
|
||||
<li><code>cpp-precomp: warning: errors during smart preprocessing, retrying in basic mode</code>
|
||||
</ul>
|
||||
|
||||
This error is due to the smart precompiler which does not fully understand C++ syntax and reverts to basic preprocessing when a smart preprocessing error occurs.
|
||||
This error can sometimes be corrected or avoided by modifying the source code. However, leaving these errors is not a problem since the preprocessor automatically switches to basic preprocessing if necessary.
|
||||
<P>
|
||||
|
||||
<h3><a name="aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></h3>
|
||||
|
||||
Because wxWindows does not have a specific API for the <i>About</i> menu item or the <i>Help</i> menu, the Mac OS port uses some static variables to help the engine make the right decisions:
|
||||
<ul>
|
||||
<li>It assumes that the <i>About</i> menu item is part of a <i>Help</i> menu.
|
||||
<li>The title of the <i>Help</i> menu is stored in <code>wxApp::s_macHelpMenuTitleName</code>, it defaults to "&Help", but you can change it in your constructor to your specific menu title.
|
||||
<li>The item Id of the <i>About</i> menu is stored in <code>wxApp::s_macAboutMenuItemID</code>, it defaults to <code>wxID_ABOUT</code>, but can be changed as well to suit your needs.
|
||||
<li>The other items of the wxWindows help menu are appended to the Mac OS <i>Help</i> menu and the translation of Ids is handled transparently for your application.
|
||||
</ul>
|
||||
<P>
|
||||
|
||||
</font>
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
|
||||
<font face="Arial, Lucida Sans, Helvetica">
|
||||
|
||||
<table width=100% border=4 cellpadding=5 cellspacing=0>
|
||||
<table width=100% border=0 cellpadding=5 cellspacing=0>
|
||||
<tr>
|
||||
<td bgcolor="#660000">
|
||||
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
|
||||
<td bgcolor="#C4ECF9">
|
||||
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
|
||||
wxWindows 2 for Motif FAQ
|
||||
</font>
|
||||
</td>
|
||||
@@ -22,8 +22,16 @@ wxWindows 2 for Motif FAQ
|
||||
|
||||
See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<hr>
|
||||
<h3>List of questions in this category</a></h3>
|
||||
<ul>
|
||||
<li><a href="#versiob">What version of Motif do I need?</a></li>
|
||||
<li><a href="#missing">What features are missing or partially implemented?</a></li>
|
||||
<li><a href="#dialoged">Does Dialog Editor work with wxWindows for Motif?</a></li>
|
||||
<li><a href="#refresh">Why are windows are not refreshed properly until I resize them?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
|
||||
<h3>What version of Motif do I need?</h3>
|
||||
<h3><a name="versiob">What version of Motif do I need?</a></h3>
|
||||
|
||||
You will need version 1.2 or above. Version 2 should also be fine. Some people
|
||||
have had a positive experience with <a href="www.lesstif.org" target=_top>Lesstif</a>,
|
||||
@@ -31,7 +39,7 @@ a free Motif clone. (Note from Julian Smart - I use the Linux version of MetroLi
|
||||
|
||||
<P>
|
||||
|
||||
<h3>What features are missing or partially implemented?</h3>
|
||||
<h3><a name="missing">What features are missing or partially implemented?</a></h3>
|
||||
|
||||
The following classes are not yet implemented: wxSpinButton, wxCheckListBox, wxJoyStick,
|
||||
wxGLCanvas.<P>
|
||||
@@ -53,32 +61,23 @@ system is in preparation.
|
||||
|
||||
<p>
|
||||
|
||||
<h3>Does Dialog Editor work with wxWindows for Motif?</h3>
|
||||
<h3><a name="dialoged">Does Dialog Editor work with wxWindows for Motif?</a></h3>
|
||||
|
||||
Suport for Dialog Editor is almost there, but there are some wrinkles to iron
|
||||
out. You may find it's useful though: compile it and see.
|
||||
out. You may find it's useful though: compile it and see.
|
||||
<P>
|
||||
|
||||
<h3>How do I switch between debugging and release compilation modes?</h3>
|
||||
|
||||
Unfortunately the makefile system doesn't currently allow you to compile
|
||||
for both simultaneously: you need
|
||||
to recompile wxWindows and your application having adjusted make.env. However,
|
||||
you could rename the binary and release library archives, and adjust your makefiles
|
||||
to use the appropriate one (or change a symbolic link).
|
||||
<P>
|
||||
|
||||
<h3>Why are windows are not refreshed properly until I resize them?</h3>
|
||||
<h3><a name="refresh">Why are windows are not refreshed properly until I resize them?</a></h3>
|
||||
|
||||
Very occasionally you can experience this glitch, probably because sometimes the
|
||||
window tries to resize and repaint itself before the final size is known. The workaround
|
||||
is to add code like this after window creation and initialization:<P>
|
||||
|
||||
<PRE>
|
||||
#ifdef __WXMOTIF__
|
||||
#ifdef __WXMOTIF__
|
||||
wxNoOptimize noOptimize;
|
||||
window->SetSize(-1, -1, w, h);
|
||||
#endif
|
||||
window->SetSize(-1, -1, w, h);
|
||||
#endif
|
||||
</PRE>
|
||||
<P>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user