Switch to a read-only combobox

[wxWidgets.git] / samples / richedit / Makefile.in

diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in
index 76732ee1e008ce861df0b08cabee6159ba4883de..4dae584d8bf486424ba32d698f2a44729eadd001 100644 (file)
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -34,12 +34,14 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
        $(__richedit___win32rc) \
+       $(__richedit_os2_lib_res) \
        richedit_wxLayout.o \
        richedit_kbList.o \
        richedit_wxllist.o \
@@ -102,6 +104,8 @@ COND_PLATFORM_OS2_1___richedit___os2_emxbindcmd = $(NM) richedit$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__richedit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richedit___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__richedit_bundle___depname = richedit_bundle
+@COND_PLATFORM_OS2_1@__richedit_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -153,8 +157,8 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc richedit.app/Contents/Resources/richedit.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns richedit.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc richedit.app/Contents/Resources/richedit.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns richedit.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@richedit_bundle: richedit.app/Contents/PkgInfo