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

"cd utils; make" should not try to compile dialoged unless

Browse Source 
wxUSE_RESOURCES=yes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-10 21:30:28 +00:00
parent 9ec5e01204
commit 5e66eee143
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -22261,11 +22261,12 @@ wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION} wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE} wx_cv_age=${WX_AGE}
wx_cv_use_gui=${USE_GUI} wx_cv_use_gui=${USE_GUI}
wx_cv_use_resources=${wxUSE_RESOURCES}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \ wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
wx_cv_use_gui wx_cv_use_gui wx_cv_use_resources
subdirs="demos samples utils contrib" subdirs="demos samples utils contrib"

3
configure.in
View File

@@ -5391,11 +5391,12 @@ wx_cv_current=${WX_CURRENT}
wx_cv_revision=${WX_REVISION} wx_cv_revision=${WX_REVISION}
wx_cv_age=${WX_AGE} wx_cv_age=${WX_AGE}
wx_cv_use_gui=${USE_GUI} wx_cv_use_gui=${USE_GUI}
wx_cv_use_resources=${wxUSE_RESOURCES}
export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \ export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
wx_cv_path_ifs wx_cv_program_ext \ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \ wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
wx_cv_use_gui wx_cv_use_gui wx_cv_use_resources
AC_CONFIG_SUBDIRS(demos samples utils contrib) AC_CONFIG_SUBDIRS(demos samples utils contrib)

3
utils/configure vendored
View File

@@ -525,6 +525,8 @@ fi
GL_TOOLKIT_DIR=$wx_cv_path_glcanvas GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
USE_GUI=$wx_cv_use_gui USE_GUI=$wx_cv_use_gui
USE_RESOURCES=$wx_cv_use_resources
@@ -688,6 +690,7 @@ s%@infodir@%$infodir%g
s%@mandir@%$mandir%g s%@mandir@%$mandir%g
s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
s%@USE_GUI@%$USE_GUI%g s%@USE_GUI@%$USE_GUI%g
s%@USE_RESOURCES@%$USE_RESOURCES%g
CEOF CEOF
EOF EOF

2
utils/configure.in
View File

@@ -5,8 +5,10 @@ AC_INIT(Makefile.in)
GL_TOOLKIT_DIR=$wx_cv_path_glcanvas GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
USE_GUI=$wx_cv_use_gui USE_GUI=$wx_cv_use_gui
USE_RESOURCES=$wx_cv_use_resources
AC_SUBST(GL_TOOLKIT_DIR) AC_SUBST(GL_TOOLKIT_DIR)
AC_SUBST(USE_GUI) AC_SUBST(USE_GUI)
AC_SUBST(USE_RESOURCES)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile

4
utils/dialoged/Makefile.in
View File

@@ -1,6 +1,8 @@
USE_RESOURCES=@USE_RESOURCES@
all: all:
cd src; $(MAKE) if test "$(USE_RESOURCES)" = "yes"; then cd src; $(MAKE); fi
clean: clean:
cd src; $(MAKE) clean cd src; $(MAKE) clean