59 lines
2.3 KiB
Plaintext
59 lines
2.3 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2005/12/31 15:18:44 naddy Exp $
|
|
--- configure.orig Sun Sep 21 13:10:06 2003
|
|
+++ configure Fri Dec 30 23:43:16 2005
|
|
@@ -1093,8 +1093,8 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_
|
|
|
|
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
|
|
|
|
-WX_CURRENT=0
|
|
-WX_REVISION=1
|
|
+#WX_CURRENT=0
|
|
+#WX_REVISION=1
|
|
WX_AGE=1
|
|
|
|
|
|
@@ -16042,9 +16042,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
|
|
fi
|
|
|
|
lib_debug_suffix=
|
|
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
|
|
- lib_debug_suffix=d
|
|
-fi
|
|
|
|
WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
|
|
|
|
@@ -16060,13 +16057,13 @@ WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
|
|
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
|
|
WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
|
|
|
|
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
|
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
|
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
|
|
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}"
|
|
|
|
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
|
|
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
|
-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
|
|
-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
|
+WX_LIBRARY_LINK1="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
|
|
+WX_LIBRARY_LINK2="lib${WX_LIBRARY%-${WX_RELEASE}}.${SO_SUFFIX}"
|
|
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}.${WX_CURRENT}"
|
|
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL%-${WX_RELEASE}}.${SO_SUFFIX}"
|
|
|
|
case "${host}" in
|
|
*-*-cygwin* | *-*-mingw32* )
|
|
@@ -16104,11 +16101,11 @@ esac
|
|
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
|
|
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
|
|
|
|
-WXCONFIG_LIBS="-l${WX_LIBRARY}"
|
|
+WXCONFIG_LIBS="-l${WX_LIBRARY%-${WX_RELEASE}}"
|
|
WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
|
|
|
|
if test "$wxUSE_OPENGL" = "yes"; then
|
|
- WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
|
|
+ WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL%-${WX_RELEASE}} ${OPENGL_LIBS}"
|
|
WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
|
|
fi
|
|
|