projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compilation for wxBase
[wxWidgets.git]
/
src
/
makeprog.vc
diff --git
a/src/makeprog.vc
b/src/makeprog.vc
index a2f9cd52dc54877c1d1581dcab94edb12c2e95e0..3559c1ca82c4efd177a5b330ac98291bf2d624dd 100644
(file)
--- a/
src/makeprog.vc
+++ b/
src/makeprog.vc
@@
-17,6
+17,10
@@
WXUSINGDLL=0
!include $(WXDIR)\src\makevc.env
!include $(WXDIR)\src\makevc.env
+!if "$(RM)" == ""
+RM= erase
+!endif
+
all: $(PROGRAM).exe
wx:
all: $(PROGRAM).exe
wx:
@@
-29,21
+33,45
@@
wxclean:
nmake -f makefile.vc clean
# cd $(THISDIR)
nmake -f makefile.vc clean
# cd $(THISDIR)
-$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+
+!if "$(wxUSE_GUI)" == ""
+wxUSE_GUI=1
+!endif
+
+!if "$(wxUSE_GUI)" == "1"
+
+#!if "$(WXUSINGDLL)" == "1"
+#DUMMYOBJ=
+#!endif
+
+$(PROGRAM).exe: $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(link) @<<
-out:$(PROGRAM).exe
$(LINKFLAGS)
$(link) @<<
-out:$(PROGRAM).exe
$(LINKFLAGS)
-$(
DUMMYOBJ) $(OBJECTS
) $(PROGRAM).res
+$(
OBJECTS) $(DUMMYOBJ
) $(PROGRAM).res
$(LIBS)
<<
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
$(LIBS)
<<
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
+!else
+
+$(PROGRAM).exe: $(WXLIB) $(OBJECTS)
+ $(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(OBJECTS) $(DUMMYOBJ)
+$(LIBS)
+<<
+
+!endif
+
+
clean:
clean:
- -
erase
$(OBJECTS)
- -
erase
*.exe
- -
erase
*.res
- -
erase
*.map
- -
erase
*.sbr
- -
erase
*.pdb
+ -
$(RM)
$(OBJECTS)
+ -
$(RM)
*.exe
+ -
$(RM)
*.res
+ -
$(RM)
*.map
+ -
$(RM)
*.sbr
+ -
$(RM)
*.pdb