fixes for warnings about implicit double -> int conversions

[wxWidgets.git] / utils / makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index bf71de13297ff661e61dd903faae7228f5b0c318..1b4bffbff53f953f26fc181fb49d69ca183e920c 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,14 +12,15 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-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)" \
-       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" 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)"
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \
+       USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_OPENGL="$(USE_OPENGL)" \
+       USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -32,6 +33,21 @@ all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res

+       cd configtool\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd emulator\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd helpview\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd tex2rtf\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd HelpGen
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)

 
 sub_configtool: 
        cd configtool\src
 
 sub_configtool: 
        cd configtool\src


@@ -43,11 +59,6 @@ sub_emulator:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 

-sub_helpgen: 
-       cd HelpGen
-       $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
-

 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all


@@ -57,3 +68,8 @@ sub_tex2rtf:
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)

+
+sub_helpgen: 
+       cd HelpGen
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)