Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index a875d3ee7bfd0291ef6d920d749dbd92b865863c..8e64d3f9db9b6246319a5f93f1540fa8aded03e1 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -6,6 +6,8 @@
 # The binary program extension, if any, including dots (e.g. '.exe')
 PROGRAM_EXT = @PROGRAM_EXT@
 BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
+RES_PROGRAM = $(PROGRAM)_resources.o
+RES_PROGRAM_OPT = @RESPROGRAM@
 
 .c.o :
        $(CCC) -c $(CFLAGS) -o $@ $<
@@ -26,8 +28,11 @@ include $(top_builddir)/src/make.env
 
 all:    $(BIN_PROGRAM) install_dirs install_data
 
-$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
+$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT)
+       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
+
+$(RES_PROGRAM):  $(PROGRAM).rc
+       $(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
 
 install_dirs:
        @list='$(DATADIRS)'; for p in $$list; do \
@@ -42,4 +47,4 @@ install_data:
        done
 
 clean:
-       rm -f $(OBJECTS) $(BIN_PROGRAM) core
+       rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core