nicer version compilation fix for wxUSE_WCHAR_T=0 (why should we duplicate definition...

[wxWidgets.git] / utils / dialoged / src / makefile.b32

diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index bda1b8a670aab326308e374aac054da7f3c4bb31..39c14b5720045df8dd2dccd7d627a5a322ebd035 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -12,58 +12,10 @@
 # WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXBASESRC = $(WXDIR)\src\base
-WXBASEINC = $(WXDIR)\include\base
-WXLIB = $(WXLIBDIR)\wx32.lib
-WXPROPDIR = $(WXDIR)\utils\wxprop
-WXPROPINC = $(WXPROPDIR)\src
-WXPROPLIB = $(WXDIR)\lib\wxprop.lib
-LIBS=$(WXLIB) $(WXPROPLIB) cw32 import32
-INCFILE = includes.cfg
 
 TARGET=dialoged
+OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj\
+ edtree.obj edlist.obj symbtabl.obj winstyle.obj
 
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
-
-OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj
-
-$(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-!
-        brc32 -K $(TARGET).res
-
-$(INCFILE):    $(MAKEFILENAME)
-       copy &&!
--I..\..\wxprop\src
-! $(INCFILE)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
-
-wxprop:
-    cd $(WXPROPDIR)\src
-    make -f makefile.b32
-    cd $(WXDIR)\utils\dialoged\src
-    
-clean:
-        -erase *.obj *.exe *.res *.map *.rws
-
+!include $(WXDIR)\src\makeprog.b32