X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a2c6ef8d186df490df28a694820a5e8afc4b5e8..f40f9976fd085fd6d2099de861159bb1062a8f46:/src/makeprog.wat

diff --git a/src/makeprog.wat b/src/makeprog.wat
index c36dce6abf..d52cc801e1 100644
--- a/src/makeprog.wat
+++ b/src/makeprog.wat
@@ -3,37 +3,50 @@ WXDIR = $(%WXWIN)
 !include $(WXDIR)\src\makewat.env
 
 WXLIB = $(WXDIR)\lib
-LNK = $(PROGRAM).lnk
+LNK = $(OUTPUTDIR)$(PROGRAM).lnk
 
-all: $(PROGRAM).exe
+all: $(OUTPUTDIR) $(OUTPUTDIR)$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC
 
-$(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib
+$(OUTPUTDIR):
+	@if not exist $^@ mkdir $^@
+
+!ifeq wxUSE_GUI 0
+RESFILE=
+!else
+RESFILE=$(OUTPUTDIR)$(PROGRAM).res
+!endif
+
+$(OUTPUTDIR)$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib
     wlink @$(LNK)
-    $(BINDCOMMAND) $(PROGRAM).res
+!ifneq wxUSE_GUI 0
+    $(BINDCOMMAND) $(RESFILE)
+!endif
 
-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-     $(RC) $(RESFLAGS1) $(PROGRAM).rc
+!ifneq wxUSE_GUI 0
+$(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+     $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
+!endif
 
 $(LNK) : makefile.wat
     %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
+    @%append $(LNK) $(LDFLAGS)
+    @%append $(LNK) $(DEBUGINFO)
+    @%append $(LNK) system $(LINKSYSTEM)
     @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(PROGRAM).exe
-    @%append $(LNK) file $(WXLIB)\wx.lib
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
+    @%append $(LNK) name $(OUTPUTDIR)$(PROGRAM).exe
     @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
-#    @%append $(LNK) $(MINDATA)
-#    @%append $(LNK) $(MAXDATA)
+    @for %i in ($(LIBS)) do @%append $(LNK) lib %i
+    @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i
 
 clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase *.lib
-    -erase *.lnk
-    -erase *.res
-    -erase *.exe
-    -erase *.lbc
+    -erase $(OUTPUTDIR)*.obj
+    -erase $(OUTPUTDIR)*.bak
+    -erase $(OUTPUTDIR)*.err
+    -erase $(OUTPUTDIR)*.pch
+    -erase $(OUTPUTDIR)*.lib
+    -erase $(LNK)
+    -erase $(OUTPUTDIR)*.res
+    -erase $(OUTPUTDIR)*.exe
+    -erase $(OUTPUTDIR)*.lbc
+	-rmdir $(OUTPUTDIR)