projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added missing -univ package control files.
[wxWidgets.git]
/
src
/
makeprog.va
diff --git
a/src/makeprog.va
b/src/makeprog.va
index e76d63ed56487fdbfe47afb7254ebe3d2dbb9098..7acc3f7b3dbe6a89a386f1b2480a7ba3f84bd8f5 100644
(file)
--- a/
src/makeprog.va
+++ b/
src/makeprog.va
@@
-10,26
+10,37
@@
# Use FINAL=1 argument to nmake to build final version with no debugging
# info
# Use FINAL=1 argument to nmake to build final version with no debugging
# info
-# Set and environment variable to point to WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\makeva.env
+#
+# Define inference rules for compiling C++ files.
+#
+{$(THISDIR)}.cpp{$(OPATH)}.obj:
+ @echo $<
+ icc @<<
+ $(CPPFLAGS) /Fo$@ /Tp $<
+ $(THISDIR)\$(@B).cpp
+<<
-all: $(PROG
RAM).exe
+all: $(PROG
TARGET)
wx:
cd $(WXDIR)\src\os2
nmake -f makefile.va FINAL=$(FINAL)
wx:
cd $(WXDIR)\src\os2
nmake -f makefile.va FINAL=$(FINAL)
-
#
cd $(THISDIR)
+ cd $(THISDIR)
wxclean:
cd $(WXDIR)\src\os2
nmake -f makefile.va clean
wxclean:
cd $(WXDIR)\src\os2
nmake -f makefile.va clean
-# cd $(THISDIR)
+ cd $(THISDIR)
+
+$(PROGRAM).obj:: $(OPATH)\$(PROGRAM).obj
+$(OPATH)\$(PROGRAM).obj: $(THISDIR)\$(PROGRAM).cpp
-$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+$(PROGRAM).res:: $(PROGRES)
+$(PROGRES):
+ $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRC) $(PROGRES)
+
+$(PROGRAM).exe:: $(PROGTARGET)
+$(PROGTARGET): $(OBJECTS) $(PROGRES) $(DUMMYOBJ) $(WXLIB)
@echo " Link::Linker "
$(LINK) @<<
/B" $(LINKFLAGS)" /Fe$@
@echo " Link::Linker "
$(LINK) @<<
/B" $(LINKFLAGS)" /Fe$@
@@
-37,15
+48,12
@@
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(OBJECTS)
$(LIBS)
<<
$(OBJECTS)
$(LIBS)
<<
- $(RC) $(PROGRAM).res $(PROGRAM).exe
-
-$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\os2\wx.rc
- $(RC) -I $(WXDIR)\include -D __VISAGECPP__ -r $(PROGRAM).rc $(PROGRAM).res
+ $(RC) $(PROGRES) $(PROGTARGET)
clean:
-erase $(OBJECTS)
clean:
-erase $(OBJECTS)
- -erase *.exe
- -erase *.obj
- -erase *.res
- -erase *.map
+ -erase
$(OPATH)\
*.exe
+ -erase
$(OPATH)\
*.obj
+ -erase
$(OPATH)\
*.res
+ -erase
$(OPATH)\
*.map