Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bakefiles for contrib/utils/convertrc and contrib/utils/wxrcedit

Browse Source 
and regenerated makefiles.
  various compilation and warning fixes for recent changes and for
WXWIN_COMPATIBILITY_2_4==0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-10 20:53:01 +00:00
parent e57f3c5d95
commit c74caa095c
24 changed files with 447 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
contrib/utils/convertrc/Makefile.in
View File

@@ -1,14 +1,152 @@
# $Id$
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
top_srcdir = @top_srcdir@/..
top_builddir = ../../..
program_dir = contrib/utils/convertrc
PROGRAM=convert
@MAKE_SET@
APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
prefix = @prefix@
exec_prefix = @exec_prefix@
INSTALL = @INSTALL@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
EXEEXT = @EXEEXT@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_XML = @EXTRALIBS_XML@
HOST_SUFFIX = @HOST_SUFFIX@
INSTALL_DIR = @INSTALL_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
LDFLAGS = @LDFLAGS@
LDFLAGS_GUI = @LDFLAGS_GUI@
RESCOMP = @RESCOMP@
SETFILE = @SETFILE@
STRIP = @STRIP@
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
bindir = @bindir@
srcdir = @srcdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
OBJECTS=convert.o rc2xml.o rc2wxr.o wxr2xml.o
### Variables: ###
include $(top_builddir)/src/makeprog.env
CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
CONVERTRC_OBJECTS = \
convertrc_convert.o \
convertrc_rc2wxr.o \
convertrc_rc2xml.o \
convertrc_wxr2xml.o \
$(__convertrc___win32rc)
LIBDIRNAME = $(top_builddir)lib
### Conditionally set variables: ###
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \
convertrc$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@COND_MONOLITHIC_0@__WXLIB_XML_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C convertrc$(EXEEXT)
@COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o
### Targets: ###
all: convertrc$(EXEEXT)
clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f convertrc$(EXEEXT)
convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
$(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__convertrc___mac_rezcmd)
$(__convertrc___mac_setfilecmd)
convertrc_convert.o: $(srcdir)/convert.cpp
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
convertrc_rc2wxr.o: $(srcdir)/rc2wxr.cpp
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
convertrc_rc2xml.o: $(srcdir)/rc2xml.cpp
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
install: all install_convertrc
install-strip: install
$(STRIP) $(bindir)/convertrc$(EXEEXT)
install_convertrc:
$(INSTALL_DIR) $(bindir)
$(INSTALL_PROGRAM) convertrc$(EXEEXT) $(bindir)
uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install install_convertrc uninstall

23
contrib/utils/convertrc/convertrc.bkl Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" ?>
<makefile>
<include file="../../../build/bakefiles/common_samples.bkl"/>
<include file="../../../build/bakefiles/common_contrib.bkl"/>
<exe id="convertrc" template="wx_contrib_util" template_append="wx_append">
<sources>
convert.cpp
rc2wxr.cpp
rc2xml.cpp
wxr2xml.cpp
</sources>
<wx-lib>core</wx-lib>
<wx-lib>deprecated</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>wxconvert.rc</win32-res>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<install-to>$(BINDIR)</install-to>
</exe>
</makefile>

28
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -251,7 +251,7 @@ if (!tok.IsNumber())
//Generate Dialog text
fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname);
fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname.c_str());
//be lazy about style for now. add it later
@@ -295,7 +295,7 @@ if (tok=="CAPTION")
title=GetQuoteField();
fprintf(m_wxr,"title = '%s',\\\n",title);
fprintf(m_wxr,"title = '%s',\\\n",title.c_str());
}
@@ -413,7 +413,7 @@ int x,y,width,height;
ReadRect(x,y,width,height);
fprintf(m_wxr," control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase,varname);
fprintf(m_wxr," control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase.c_str(),varname.c_str());
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
@@ -439,7 +439,7 @@ int x,y,width,height;
ReadRect(x,y,width,height);
fprintf(m_wxr," control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname);
fprintf(m_wxr," control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname.c_str());
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
@@ -491,7 +491,7 @@ int x,y,width,height;
ReadRect(x,y,width,height);
fprintf(m_wxr," control = [%i,wxButton,'%s','0','%s',",c,phrase,varname);
fprintf(m_wxr," control = [%i,wxButton,'%s','0','%s',",c,phrase.c_str(),varname.c_str());
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
@@ -551,7 +551,7 @@ int x,y,width,height;
ReadRect(x,y,width,height);
fprintf(m_wxr," control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase,varname);
fprintf(m_wxr," control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase.c_str(),varname.c_str());
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
@@ -771,7 +771,7 @@ ReadRect(x,y,width,height);
fprintf(m_wxr," control = [%i,wxChoice,'','0','%s',",m_controlid,varname);
fprintf(m_wxr," control = [%i,wxChoice,'','0','%s',",m_controlid,varname.c_str());
fprintf(m_wxr,"%i,%i,%i,%i,[],\\\n",x,y,width,height);
@@ -795,7 +795,7 @@ static int menuid=0;
menuid++;
fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name);
fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name.c_str());
fprintf(m_wxr,"menu = \\\n");
@@ -857,7 +857,7 @@ spot=tok.First("\\t");
tok=tok.Left(spot);
fprintf(m_wxr," ['%s',%i,'',\\\n",tok,menuitem);
fprintf(m_wxr," ['%s',%i,'',\\\n",tok.c_str(),menuitem);
while ((tok!="BEGIN")&(tok!="{"))
@@ -893,7 +893,7 @@ tok=tok.Left(spot);
menuitem++;
fprintf(m_wxr," ['%s',%i,''],\\\n",tok,menuitem);
fprintf(m_wxr," ['%s',%i,''],\\\n",tok.c_str(),menuitem);
}
@@ -981,7 +981,7 @@ wxString tok;
while (ReadOrs(tok));
fprintf(m_wxr," control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname);
fprintf(m_wxr," control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname.c_str());
int x,y,width,height;
@@ -1011,7 +1011,7 @@ wxString tok;
while (ReadOrs(tok));
fprintf(m_wxr," control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname);
fprintf(m_wxr," control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname.c_str());
int x,y,width,height;
@@ -1069,7 +1069,7 @@ if (tok=="BS_AUTOCHECKBOX")
{
fprintf(m_wxr," control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label,varname);
fprintf(m_wxr," control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label.c_str(),varname.c_str());
while (ReadOrs(tok));
@@ -1087,7 +1087,7 @@ if (tok=="BS_AUTORADIOBUTTON")
{
fprintf(m_wxr," control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label,varname);
fprintf(m_wxr," control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label.c_str(),varname.c_str());
while(ReadOrs(tok));