Regenerated makefiles

[wxWidgets.git] / contrib / utils / convertrc / makefile.wat

diff --git a/contrib/utils/convertrc/makefile.wat b/contrib/utils/convertrc/makefile.wat
index 7aa5e34251f11c8ed8641fd469a17a9f5e948b6e..6c801b86448f31264eacd3c34de07582bd7053e2 100644 (file)
--- a/contrib/utils/convertrc/makefile.wat
+++ b/contrib/utils/convertrc/makefile.wat
@@ -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.4 (http://bakefile.sourceforge.net)

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


@@ -27,13 +27,6 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\..\..\lib\wat_dll$(CFG)
-!endif

 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base


@@ -50,10 +43,6 @@ WXDEBUGFLAG = d
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif

-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif

 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u
 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u


@@ -62,6 +51,17 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif

 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default


@@ -96,31 +96,6 @@ __DEBUGINFO_1 =
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif

-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif

 __OPTIMIZEFLAG_2 =
 !ifeq BUILD debug
 __OPTIMIZEFLAG_2 = -od
 __OPTIMIZEFLAG_2 =
 !ifeq BUILD debug
 __OPTIMIZEFLAG_2 = -od


@@ -135,48 +110,91 @@ __RUNTIME_LIBS_5 = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif

-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
+__EXCEPTIONSFLAG_7 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_7 = 

 !endif
 !endif

-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_7 = -xs

 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\..\lib\wat_dll$(CFG)

 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif

+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CONVERTRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
+WX_RELEASE_NODOT = 25
+OBJS = &
+       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CONVERTRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &

        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -wcd=549 &
+       -wcd=656 -wcd=657 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH &
+       -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)

 CONVERTRC_OBJECTS =  &
        $(OBJS)\convertrc_convert.obj &
        $(OBJS)\convertrc_rc2wxr.obj &
        $(OBJS)\convertrc_rc2xml.obj &
        $(OBJS)\convertrc_wxr2xml.obj
 CONVERTRC_OBJECTS =  &
        $(OBJS)\convertrc_convert.obj &
        $(OBJS)\convertrc_rc2wxr.obj &
        $(OBJS)\convertrc_rc2xml.obj &
        $(OBJS)\convertrc_wxr2xml.obj

-OBJS = &
-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = &
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -187,21 +205,6 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\convertrc.exe
 
 
 all : .SYMBOLIC $(OBJS)\convertrc.exe
 

-$(OBJS)\convertrc_convert.obj :  .AUTODEPEND .\convert.cpp
-       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_rc2wxr.obj :  .AUTODEPEND .\rc2wxr.cpp
-       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_rc2xml.obj :  .AUTODEPEND .\rc2xml.cpp
-       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_wxconvert.res :  .AUTODEPEND .\wxconvert.rc
-       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $<
-
-$(OBJS)\convertrc_wxr2xml.obj :  .AUTODEPEND .\wxr2xml.cpp
-       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-

 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res


@@ -216,6 +219,21 @@ $(OBJS)\convertrc.exe :  $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert.res
        @%append $(OBJS)\convertrc.lbc option caseexact
        @%append $(OBJS)\convertrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(CONVERTRC_OBJECTS)) do @%append $(OBJS)\convertrc.lbc file %i
        @%append $(OBJS)\convertrc.lbc option caseexact
        @%append $(OBJS)\convertrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(CONVERTRC_OBJECTS)) do @%append $(OBJS)\convertrc.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\convertrc.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\convertrc.lbc library %i

        @%append $(OBJS)\convertrc.lbc option resource=$(OBJS)\convertrc_wxconvert.res
        wlink @$(OBJS)\convertrc.lbc
        @%append $(OBJS)\convertrc.lbc option resource=$(OBJS)\convertrc_wxconvert.res
        wlink @$(OBJS)\convertrc.lbc

+
+$(OBJS)\convertrc_convert.obj :  .AUTODEPEND .\convert.cpp
+       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
+
+$(OBJS)\convertrc_rc2wxr.obj :  .AUTODEPEND .\rc2wxr.cpp
+       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
+
+$(OBJS)\convertrc_rc2xml.obj :  .AUTODEPEND .\rc2xml.cpp
+       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
+
+$(OBJS)\convertrc_wxr2xml.obj :  .AUTODEPEND .\wxr2xml.cpp
+       $(CXX) -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
+
+$(OBJS)\convertrc_wxconvert.res :  .AUTODEPEND .\wxconvert.rc
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $<