]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.g95
change to /usr/share/wx/version
[wxWidgets.git] / src / msw / makefile.g95
index df4e156f6b8fccc672fc5c3b360b698fecd959e4..5fe109c698a72bd909b6dc521134895c2f0cf5e2 100644 (file)
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 16:36, 2001/11/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -21,14 +21,14 @@ include $(WXDIR)/src/makeg95.env
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL
-WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
-WXDEF = wx$(WXVERSION).def
+WXDLL = $(WXDIR)/lib/wxmsw$(WXVERSION)$(UNIEXT).dll
+WXDEF = wxmsw$(WXVERSION)$(UNIEXT).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-                     $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a
+                    $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
-             -luuid -lrpcrt4 -lodbc32 -lwinmm \
+             -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
              -lwsock32 $(DLL_EXTRA_LIBS) \
                  -lstdc++
 endif
@@ -43,16 +43,16 @@ HTMLDIR = $(WXDIR)/src/html
 ZLIBDIR = $(WXDIR)/src/zlib
 PNGDIR  = $(WXDIR)/src/png
 JPEGDIR = $(WXDIR)/src/jpeg
-XPMDIR  = $(WXDIR)/src/xpm
 TIFFDIR = $(WXDIR)/src/tiff
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
+REGEXDIR= $(WXDIR)/src/regex
 
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 PNGLIB  = $(WXDIR)/lib/libpng.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
-XPMLIB  = $(WXDIR)/lib/libxpm.a
 TIFFLIB = $(WXDIR)/lib/libtiff.a
+REGEXLIB= $(WXDIR)/lib/libregex.a
 
 DOCDIR = $(WXDIR)/docs
 
@@ -72,24 +72,31 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dcpsg.$(OBJSUFF) \
+               $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridctrl.$(OBJSUFF) \
+               $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/numdlgg.$(OBJSUFF) \
                $(GENDIR)/panelg.$(OBJSUFF) \
-               $(GENDIR)/plot.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/prop.$(OBJSUFF) \
                $(GENDIR)/propform.$(OBJSUFF) \
                $(GENDIR)/proplist.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \
-               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \
+               $(GENDIR)/spinctlg.$(OBJSUFF) \
+               $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/tipwin.$(OBJSUFF) \
+               $(GENDIR)/treectlg.$(OBJSUFF) \
                $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
 
@@ -98,30 +105,40 @@ COMMONOBJS  = \
                $(COMMDIR)/appcmn.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
+               $(COMMDIR)/clntdata.$(OBJSUFF) \
                $(COMMDIR)/cmdline.$(OBJSUFF) \
+               $(COMMDIR)/cmdproc.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/containr.$(OBJSUFF) \
+               $(COMMDIR)/cshelp.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbgrid.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dircmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
+               $(COMMDIR)/dseldlg.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/encconv.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
+               $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
                $(COMMDIR)/ffile.$(OBJSUFF) \
                $(COMMDIR)/file.$(OBJSUFF) \
                $(COMMDIR)/fileconf.$(OBJSUFF) \
                $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filename.$(OBJSUFF) \
                $(COMMDIR)/filesys.$(OBJSUFF) \
                $(COMMDIR)/fontcmn.$(OBJSUFF) \
                $(COMMDIR)/fontmap.$(OBJSUFF) \
@@ -130,6 +147,7 @@ COMMONOBJS  = \
                $(COMMDIR)/fs_mem.$(OBJSUFF) \
                $(COMMDIR)/fs_zip.$(OBJSUFF) \
                $(COMMDIR)/ftp.$(OBJSUFF) \
+               $(COMMDIR)/gaugecmn.$(OBJSUFF) \
                $(COMMDIR)/gdicmn.$(OBJSUFF) \
                $(COMMDIR)/geometry.$(OBJSUFF) \
                $(COMMDIR)/gifdecod.$(OBJSUFF) \
@@ -145,6 +163,7 @@ COMMONOBJS  = \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagtiff.$(OBJSUFF) \
+               $(COMMDIR)/imagxpm.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
@@ -152,17 +171,23 @@ COMMONOBJS  = \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/longlong.$(OBJSUFF) \
+               $(COMMDIR)/matrix.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/mimecmn.$(OBJSUFF) \
                $(COMMDIR)/module.$(OBJSUFF) \
                $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/nbkbase.$(OBJSUFF) \
                $(COMMDIR)/object.$(OBJSUFF) \
                $(COMMDIR)/objstrm.$(OBJSUFF) \
                $(COMMDIR)/paper.$(OBJSUFF) \
+               $(COMMDIR)/popupcmn.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/quantize.$(OBJSUFF) \
+               $(COMMDIR)/radiocmn.$(OBJSUFF) \
+               $(COMMDIR)/regex.$(OBJSUFF) \
                $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sckaddr.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
@@ -171,14 +196,19 @@ COMMONOBJS  = \
                $(COMMDIR)/serbase.$(OBJSUFF) \
                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/statbar.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
+               $(COMMDIR)/sysopt.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
+               $(COMMDIR)/textbuf.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/toplvcmn.$(OBJSUFF) \
+               $(COMMDIR)/treebase.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/unzip.$(OBJSUFF) \
                $(COMMDIR)/url.$(OBJSUFF) \
@@ -191,6 +221,7 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
+               $(COMMDIR)/xpmdecod.$(OBJSUFF) \
                $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
@@ -248,6 +279,8 @@ MSWOBJS     = \
                $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/enhmeta.$(OBJSUFF) \
+               $(MSWDIR)/evtloop.$(OBJSUFF) \
+               $(MSWDIR)/fdrepdlg.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/fontdlg.$(OBJSUFF) \
@@ -259,6 +292,9 @@ MSWOBJS     = \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/glcanvas.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
+               $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+               $(MSWDIR)/helpbest.$(OBJSUFF) \
+               $(MSWDIR)/helpchm.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/icon.$(OBJSUFF) \
                $(MSWDIR)/imaglist.$(OBJSUFF) \
@@ -289,6 +325,7 @@ MSWOBJS     = \
                $(MSWDIR)/scrolbar.$(OBJSUFF) \
                $(MSWDIR)/settings.$(OBJSUFF) \
                $(MSWDIR)/slider95.$(OBJSUFF) \
+               $(MSWDIR)/snglinst.$(OBJSUFF) \
                $(MSWDIR)/spinbutt.$(OBJSUFF) \
                $(MSWDIR)/spinctrl.$(OBJSUFF) \
                $(MSWDIR)/statbmp.$(OBJSUFF) \
@@ -300,15 +337,16 @@ MSWOBJS     = \
                $(MSWDIR)/taskbar.$(OBJSUFF) \
                $(MSWDIR)/tbar95.$(OBJSUFF) \
                $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/tglbtn.$(OBJSUFF) \
                $(MSWDIR)/thread.$(OBJSUFF) \
                $(MSWDIR)/timer.$(OBJSUFF) \
                $(MSWDIR)/tooltip.$(OBJSUFF) \
+               $(MSWDIR)/toplevel.$(OBJSUFF) \
                $(MSWDIR)/treectrl.$(OBJSUFF) \
                $(MSWDIR)/utils.$(OBJSUFF) \
                $(MSWDIR)/utilsexc.$(OBJSUFF) \
                $(MSWDIR)/wave.$(OBJSUFF) \
-               $(MSWDIR)/window.$(OBJSUFF) \
-               $(MSWDIR)/xpmhand.$(OBJSUFF)
+               $(MSWDIR)/window.$(OBJSUFF)
 
 ADVANCEDOBJS     = \
                $(COMMDIR)/odbc.$(OBJSUFF) \
@@ -401,26 +439,6 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJS =    $(XPMDIR)/attrib.o\
-               $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o\
-               $(XPMDIR)/crifrbuf.o\
-               $(XPMDIR)/crifrdat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/image.o\
-               $(XPMDIR)/info.o\
-               $(XPMDIR)/hashtab.o\
-               $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o\
-               $(XPMDIR)/rdftodat.o\
-               $(XPMDIR)/rdftoi.o\
-               $(XPMDIR)/rgb.o\
-               $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o\
-               $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffri.o
-
 TIFFOBJS = $(TIFFDIR)/tif_aux.o \
                $(TIFFDIR)/tif_close.o \
                $(TIFFDIR)/tif_codec.o \
@@ -465,12 +483,41 @@ else
   OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
+# MBN: if anyone has a better solution for this kludge, step
+#      forward, *please*
+# this tests is we are on cygwin or not ( will _not_ work if you are using
+# ZSH on plain Win32, tought ); it uses the presence of "/"
+# in the PATH variable
+
+# how do you do "VAR=\" ? BLEAGH!
+BACKSLASH=$(subst a,\,a)
+ifeq (,$(findstring /,$(PATH)))
+  IS_CYGWIN=0
+  PATH_SEPARATOR:=$(BACKSLASH)
+  PATH_SUBST=/
+else
+  IS_CYGWIN=1
+  PATH_SEPARATOR=/
+  PATH_SUBST:=$(BACKSLASH)
+endif
+
+ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+
+SETUP_H=$(ARCHINCDIR)/wx/setup.h
+
 ifndef WXMAKINGDLL
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB)
+all:    $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
 else
-all:    $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) $(WXDLL)
+all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
 endif
 
+$(ARCHINCDIR)/wx:
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
+
+$(SETUP_H): $(ARCHINCDIR)/wx
+       $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+
 ifndef WXMAKINGDLL
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
@@ -534,21 +581,19 @@ $(JPEGLIB): $(JPEGOBJS)
        $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
-$(XPMLIB): $(XPMOBJS)
-       $(AR) $(AROPTIONS) $@ $(XPMOBJS)
-       $(RANLIB) $@
-
 $(TIFFLIB): $(TIFFOBJS)
        $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
        $(RANLIB) $@
 
+$(REGEXLIB):
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
 
-$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
        $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
-$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c           
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
        $(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
@@ -602,16 +647,18 @@ clean:
        -$(RM) ../png/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../jpeg/*.bak
-       -$(RM) ../xpm/*.o
-       -$(RM) ../xpm/*.bak
        -$(RM) ../tiff/*.o
        -$(RM) ../tiff/*.bak
+       -$(RM) ../regex/*.o
+       -$(RM) ../regex/*.bak
+
+cleanall: clean
        -$(RM) $(WXLIB)
        -$(RM) $(ZLIBLIB)
        -$(RM) $(PNGLIB)
        -$(RM) $(JPEGLIB)
-       -$(RM) $(XPMLIB)
        -$(RM) $(TIFFLIB)
+       -$(RM) $(REGEXLIB)
 
 ifdef WXMAKINGDLL
        -$(RM) $(WXDLL)
@@ -622,7 +669,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
 endif
 endif
 
-
-cleanall: clean
-
-