avoid a bug in Carbon headers

[wxWidgets.git] / utils / makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index ece8395fe1fa0cef38fe6f2a072e5ddd7a6395a2..8618cf12be7ce3e515b6be2572c293b6709a8de2 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,92 +1,44 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds utilities for Win95, VC++ 4.0
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
 
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
+!include <../build/msw/config.vc>
 
-THISDIR=$(WXDIR)\utils
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
 
-!include $(WXDIR)\src\ntwxwin.mak
+### Variables: ###
 
-DEBUG_FLAGS="/Zi /FR"
-LINK_DEBUG_FLAGS="/RELEASE"
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+       USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
+       VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
+       USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
 
-all:
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\mfutils\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wximage\win
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxweb\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxhelp2\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\clockwrk\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxanim\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\colours
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\ogl\src
-#        nmake -f makefile.vc DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc test DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+### Conditionally set variables: ###
 
-clean:
-        cd $(WXDIR)\utils\dialoged\src
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\utils\nplugin
-        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\hytext\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\mfutils\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\tex2rtf\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxbuild\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxgraph\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxtree\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxhelp\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxhelp2\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\clockwrk\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxanim\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\colours
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\ogl\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxchart\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wxweb\src
-#        nmake -f makefile.vc clean
-#        cd $(WXDIR)\utils\wximage\win
-#        nmake -f makefile.vc clean
+
+
+### Targets: ###
+
+all: sub_tex2rtf sub_helpgen
+
+clean: 
+       -if exist .\*.obj del .\*.obj
+       -if exist .\*.res del .\*.res
+
+sub_helpgen: 
+       cd HelpGen
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_tex2rtf: 
+       cd tex2rtf\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)