wxFileConfig ctor now (again) uses the files in the correct locations if the

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index e5748cdd8aef62223415392ae26bed9cb2be049b..5db4dfeeb63b47f589d13ca060b7dc212298a1f5 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -79,11 +79,13 @@ COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
   $(COMMDIR)/docview.$(OBJSUFF) \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
   $(COMMDIR)/docview.$(OBJSUFF) \

+  $(COMMDIR)/docmdi.$(OBJSUFF) \

   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/event.$(OBJSUFF) \
   $(COMMDIR)/file.$(OBJSUFF) \
   $(COMMDIR)/fileconf.$(OBJSUFF) \
   $(COMMDIR)/filefn.$(OBJSUFF) \
   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/event.$(OBJSUFF) \
   $(COMMDIR)/file.$(OBJSUFF) \
   $(COMMDIR)/fileconf.$(OBJSUFF) \
   $(COMMDIR)/filefn.$(OBJSUFF) \

+  $(COMMDIR)/framecmn.$(OBJSUFF) \

   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/intl.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/intl.$(OBJSUFF) \


@@ -94,6 +96,7 @@ COMMONOBJS = \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
   $(COMMDIR)/postscrp.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
   $(COMMDIR)/postscrp.$(OBJSUFF) \

+  $(COMMDIR)/process.$(OBJSUFF) \

   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
   $(COMMDIR)/tbarbase.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
   $(COMMDIR)/tbarbase.$(OBJSUFF) \


@@ -109,12 +112,17 @@ COMMONOBJS = \
   $(COMMDIR)/list.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \
   $(COMMDIR)/list.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \

-  $(COMMDIR)/y_tab.$(OBJSUFF)
-
-#  $(COMMDIR)/wxstrgnu/wxstrgnu.$(OBJSUFF) \
-#  $(COMMDIR)/wxstrgnu/wxregex.$(OBJSUFF)
+  $(COMMDIR)/y_tab.$(OBJSUFF) \
+  $(COMMDIR)/stream.$(OBJSUFF) \
+  $(COMMDIR)/fstream.$(OBJSUFF) \
+  $(COMMDIR)/mstream.$(OBJSUFF) \
+  $(COMMDIR)/zstream.$(OBJSUFF) \
+  $(COMMDIR)/datstrm.$(OBJSUFF) \
+  $(COMMDIR)/extended.$(OBJSUFF) \
+  $(COMMDIR)/wincmn.$(OBJSUFF)

 
 MSWOBJS = \
 
 MSWOBJS = \

+  accel.$(OBJSUFF) \

   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \
   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \


@@ -144,7 +152,8 @@ MSWOBJS = \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   frame.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   frame.$(OBJSUFF) \

-  gauge.$(OBJSUFF) \
+  gaugemsw.$(OBJSUFF) \
+  gauge95.$(OBJSUFF) \

   gdiobj.$(OBJSUFF) \
   helpwin.$(OBJSUFF) \
   icon.$(OBJSUFF) \
   gdiobj.$(OBJSUFF) \
   helpwin.$(OBJSUFF) \
   icon.$(OBJSUFF) \


@@ -160,6 +169,7 @@ MSWOBJS = \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \

+  notebook.$(OBJSUFF) \

   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \
   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \


@@ -170,9 +180,11 @@ MSWOBJS = \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \

+  regconf.$(OBJSUFF) \

   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \

-  slider.$(OBJSUFF) \
+  slidrmsw.$(OBJSUFF) \
+  slider95.$(OBJSUFF) \

   spinbutt.$(OBJSUFF) \
   statbmp.$(OBJSUFF) \
   statbox.$(OBJSUFF) \
   spinbutt.$(OBJSUFF) \
   statbmp.$(OBJSUFF) \
   statbox.$(OBJSUFF) \


@@ -187,9 +199,12 @@ MSWOBJS = \
   timer.$(OBJSUFF) \
   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \
   timer.$(OBJSUFF) \
   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \

+  utilsexc.$(OBJSUFF) \

   wave.$(OBJSUFF) \
   window.$(OBJSUFF) \
   $(OLEDIR)/droptgt.$(OBJSUFF) \
   wave.$(OBJSUFF) \
   window.$(OBJSUFF) \
   $(OLEDIR)/droptgt.$(OBJSUFF) \

+  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+  $(OLEDIR)/dataobj.$(OBJSUFF) \

   $(OLEDIR)/oleutils.$(OBJSUFF) \
   $(OLEDIR)/uuid.$(OBJSUFF)
 
   $(OLEDIR)/oleutils.$(OBJSUFF) \
   $(OLEDIR)/uuid.$(OBJSUFF)