projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for daily builds
[wxWidgets.git]
/
src
/
makeprog.vc
diff --git
a/src/makeprog.vc
b/src/makeprog.vc
index d7c0d79be48b734ba103a022c6e73f065aab80cb..1a4c5ef2bf2b5b0fe35f304a999a897906ad2e55 100644
(file)
--- a/
src/makeprog.vc
+++ b/
src/makeprog.vc
@@
-2,7
+2,7
@@
# File: makefile.nt
# Author: Julian Smart
# Created: 1999
# File: makefile.nt
# Author: Julian Smart
# Created: 1999
-# Updated:
+# Updated:
# Copyright: (c) Julian Smart
#
# Makefile environment for building samples. Include this from
# Copyright: (c) Julian Smart
#
# Makefile environment for building samples. Include this from
@@
-11,12
+11,16
@@
# info
# Set WXDIR for your system
# info
# Set WXDIR for your system
-WXDIR =
j:\dev\wx2\wxWindows
+WXDIR =
$(WXWIN)
WXUSINGDLL=0
!include $(WXDIR)\src\makevc.env
WXUSINGDLL=0
!include $(WXDIR)\src\makevc.env
+!if "$(RM)" == ""
+RM= erase
+!endif
+
all: $(PROGRAM).exe
wx:
all: $(PROGRAM).exe
wx:
@@
-29,18
+33,45
@@
wxclean:
nmake -f makefile.vc clean
# cd $(THISDIR)
nmake -f makefile.vc clean
# cd $(THISDIR)
-$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS)
+
+!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)
+$(
OBJECTS) $(DUMMYOBJ) $(PROGRAM).res
$(LIBS)
<<
$(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