projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catching errors
[wxWidgets.git]
/
src
/
makeprog.vc
diff --git
a/src/makeprog.vc
b/src/makeprog.vc
index 1db976b6d5d2cf3cc9d5d820045b283d1fbe59c1..e2c76535c4c6804caccddeca981a1b1b9243fe2c 100644
(file)
--- a/
src/makeprog.vc
+++ b/
src/makeprog.vc
@@
-13,10
+13,16
@@
# Set WXDIR for your system
WXDIR = $(WXWIN)
# Set WXDIR for your system
WXDIR = $(WXWIN)
+!ifndef WXUSINGDLL
WXUSINGDLL=0
WXUSINGDLL=0
+!endif
!include $(WXDIR)\src\makevc.env
!include $(WXDIR)\src\makevc.env
+!if "$(RM)" == ""
+RM= erase
+!endif
+
all: $(PROGRAM).exe
wx:
all: $(PROGRAM).exe
wx:
@@
-29,6
+35,17
@@
wxclean:
nmake -f makefile.vc clean
# cd $(THISDIR)
nmake -f makefile.vc clean
# cd $(THISDIR)
+
+!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
$(PROGRAM).exe: $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(link) @<<
-out:$(PROGRAM).exe
@@
-40,10
+57,23
@@
$(LIBS)
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
$(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) *.obj
+ -
$(RM)
*.exe
+ -
$(RM)
*.res
+ -
$(RM)
*.map
+ -
$(RM)
*.sbr
+ -
$(RM)
*.pdb