Sizer based dialogs (like wxSingleChoiceDialog) are now forced to initially appear...

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4a1c44411f292a1262400d9db99bdf531580e98e..6408f04a2aa368301b425eeb7ae6f1e321c7bb02 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/ole
+VP12 = @top_srcdir@/src/msw/ole
 
 FTVP01 = @top_srcdir@/src/freetype/unix
 FTVP02 = @top_srcdir@/src/freetype/autohint
@@ -337,7 +337,15 @@ IODBCOBJS = \
                misc.o \
                prepare.o \
                result.o
-        
+
+OLEOBJS = \
+               automtn.o \
+               dataobj.o \
+               dropsrc.o \
+               droptgt.o \
+               oleutils.o \
+               uuid.o
+  
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
@@ -363,6 +371,12 @@ all: @WX_ALL@
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
 
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+       $(DEREZ) $^ $(DEREZFLAGS) > $@
+
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+       $(REZ) $(REZFLAGS) $^ -o $@
+
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@