]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.g95
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
compilation fix for non-threaded compilation (threads are still broken
[wxWidgets.git] / src / msw / makefile.g95
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f627f8fa904984dad274abd0705ac80e2acf49f2..acb6028c659d462de4a44858d9a982f266c4be5f 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:22, 1999/11/07
+# This file was automatically generated by tmake at 16:37, 2000/01/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -33,16 +33,29 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 
+XPMLIB = $(WXDIR)/lib/libxpm.a
 PNGLIB = $(WXDIR)/lib/libpng.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 
 DOCDIR = $(WXDIR)\docs
 
 PNGLIB = $(WXDIR)/lib/libpng.a
 ZLIBLIB = $(WXDIR)/lib/libzlib.a
 JPEGLIB = $(WXDIR)/lib/libjpeg.a
 
 DOCDIR = $(WXDIR)\docs
 
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+               DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
+               $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
-               $(GENDIR)/dirdlgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
@@ -56,7 +69,7 @@ GENERICOBJS = \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
                $(GENDIR)/scrolwin.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/statusbr.$(OBJSUFF) \
-               $(GENDIR)/tabg.$(OBJSUFF) \
+               $(GENDIR)/tbarsmpl.$(OBJSUFF) \
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
                $(GENDIR)/textdlgg.$(OBJSUFF) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
@@ -66,11 +79,12 @@ COMMONOBJS  = \
                $(COMMDIR)/appcmn.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
                $(COMMDIR)/appcmn.$(OBJSUFF) \
                $(COMMDIR)/choiccmn.$(OBJSUFF) \
                $(COMMDIR)/clipcmn.$(OBJSUFF) \
+               $(COMMDIR)/cmdline.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
                $(COMMDIR)/cmndata.$(OBJSUFF) \
                $(COMMDIR)/config.$(OBJSUFF) \
                $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
                $(COMMDIR)/ctrlsub.$(OBJSUFF) \
-               $(COMMDIR)/date.$(OBJSUFF) \
+               $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
@@ -81,6 +95,7 @@ COMMONOBJS  = \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/encconv.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
                $(COMMDIR)/ffile.$(OBJSUFF) \
                $(COMMDIR)/event.$(OBJSUFF) \
                $(COMMDIR)/extended.$(OBJSUFF) \
                $(COMMDIR)/ffile.$(OBJSUFF) \
@@ -107,12 +122,14 @@ COMMONOBJS  = \
                $(COMMDIR)/imagpcx.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
                $(COMMDIR)/imagpcx.$(OBJSUFF) \
                $(COMMDIR)/imagpng.$(OBJSUFF) \
                $(COMMDIR)/imagpnm.$(OBJSUFF) \
+               $(COMMDIR)/imagtiff.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/lboxcmn.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
                $(COMMDIR)/intl.$(OBJSUFF) \
                $(COMMDIR)/ipcbase.$(OBJSUFF) \
                $(COMMDIR)/layout.$(OBJSUFF) \
                $(COMMDIR)/lboxcmn.$(OBJSUFF) \
                $(COMMDIR)/list.$(OBJSUFF) \
                $(COMMDIR)/log.$(OBJSUFF) \
+               $(COMMDIR)/longlong.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/mimetype.$(OBJSUFF) \
                $(COMMDIR)/memory.$(OBJSUFF) \
                $(COMMDIR)/menucmn.$(OBJSUFF) \
                $(COMMDIR)/mimetype.$(OBJSUFF) \
@@ -136,10 +153,8 @@ COMMONOBJS  = \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
-               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
-               $(COMMDIR)/time.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
                $(COMMDIR)/timercmn.$(OBJSUFF) \
                $(COMMDIR)/tokenzr.$(OBJSUFF) \
                $(COMMDIR)/txtstrm.$(OBJSUFF) \
@@ -167,6 +182,7 @@ HTMLOBJS = \
                $(HTMLDIR)/htmltag.$(OBJSUFF) \
                $(HTMLDIR)/htmlwin.$(OBJSUFF) \
                $(HTMLDIR)/htmprint.$(OBJSUFF) \
                $(HTMLDIR)/htmltag.$(OBJSUFF) \
                $(HTMLDIR)/htmlwin.$(OBJSUFF) \
                $(HTMLDIR)/htmprint.$(OBJSUFF) \
+               $(HTMLDIR)/m_dflist.$(OBJSUFF) \
                $(HTMLDIR)/m_fonts.$(OBJSUFF) \
                $(HTMLDIR)/m_hline.$(OBJSUFF) \
                $(HTMLDIR)/m_image.$(OBJSUFF) \
                $(HTMLDIR)/m_fonts.$(OBJSUFF) \
                $(HTMLDIR)/m_hline.$(OBJSUFF) \
                $(HTMLDIR)/m_image.$(OBJSUFF) \
@@ -203,8 +219,10 @@ MSWOBJS     = \
                $(MSWDIR)/dcscreen.$(OBJSUFF) \
                $(MSWDIR)/dde.$(OBJSUFF) \
                $(MSWDIR)/dialog.$(OBJSUFF) \
                $(MSWDIR)/dcscreen.$(OBJSUFF) \
                $(MSWDIR)/dde.$(OBJSUFF) \
                $(MSWDIR)/dialog.$(OBJSUFF) \
+               $(MSWDIR)/dialup.$(OBJSUFF) \
                $(MSWDIR)/dib.$(OBJSUFF) \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
                $(MSWDIR)/dib.$(OBJSUFF) \
                $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/dir.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
                $(MSWDIR)/dragimag.$(OBJSUFF) \
                $(MSWDIR)/filedlg.$(OBJSUFF) \
                $(MSWDIR)/font.$(OBJSUFF) \
@@ -213,6 +231,7 @@ MSWOBJS     = \
                $(MSWDIR)/fontutil.$(OBJSUFF) \
                $(MSWDIR)/frame.$(OBJSUFF) \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
                $(MSWDIR)/fontutil.$(OBJSUFF) \
                $(MSWDIR)/frame.$(OBJSUFF) \
                $(MSWDIR)/gauge95.$(OBJSUFF) \
+               $(MSWDIR)/gdiimage.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
                $(MSWDIR)/gdiobj.$(OBJSUFF) \
                $(MSWDIR)/gsocket.$(OBJSUFF) \
                $(MSWDIR)/helpwin.$(OBJSUFF) \
@@ -234,7 +253,6 @@ MSWOBJS     = \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \
                $(MSWDIR)/palette.$(OBJSUFF) \
                $(MSWDIR)/pen.$(OBJSUFF) \
                $(MSWDIR)/penwin.$(OBJSUFF) \
-               $(MSWDIR)/pnghand.$(OBJSUFF) \
                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \
                $(MSWDIR)/printdlg.$(OBJSUFF) \
                $(MSWDIR)/printwin.$(OBJSUFF) \
                $(MSWDIR)/radiobox.$(OBJSUFF) \
@@ -357,7 +375,7 @@ JPEGOBJS    = \
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
                $(JPEGDIR)/jquant2.$(OBJSUFF) \
                $(JPEGDIR)/jdmerge.$(OBJSUFF)
 
-XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
+XPMOBJS =    $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/crdatfri.o\
                $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
                $(XPMDIR)/crifrdat.o\
                $(XPMDIR)/crdatfri.o\
                $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
                $(XPMDIR)/crifrdat.o\
@@ -369,19 +387,17 @@ XPMOBJECTS =      $(XPMDIR)/crbuffri.o\
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
                $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
                $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)  
-
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
   else
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
   endif
 else
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
 endif
 
 endif
 
-all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB) $(XPMLIB)
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
@@ -399,6 +415,10 @@ $(JPEGLIB): $(JPEGOBJS)
        ar $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
        ar $(AROPTIONS) $@ $(JPEGOBJS)
        $(RANLIB) $@
 
+$(XPMLIB): $(XPMOBJS)
+       ar $(AROPTIONS) $@ $(XPMOBJS)
+       $(RANLIB) $@
+
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
@@ -457,6 +477,9 @@ clean:
        -$(RM) ../zlib/*.o
        -$(RM) ../zlib/*.bak
        -$(RM) ../jpeg/*.o
        -$(RM) ../zlib/*.o
        -$(RM) ../zlib/*.bak
        -$(RM) ../jpeg/*.o
+       -$(RM) ../jpeg/*.bak
+       -$(RM) ../xpm/*.o
+       -$(RM) ../xpm/*.bak
        -$(RM) ../../lib/libwx.a
 
 cleanall: clean
        -$(RM) ../../lib/libwx.a
 
 cleanall: clean
wxWidgets (Impactor)