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

Makefile changes for static libs and HP-UX,

Browse Source 
Compile fixes for HP-UX,


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-09 11:20:06 +00:00
parent 307f16e829
commit de87c35312
6 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.in
View File

@@ -1,5 +1,5 @@
# #
# This file was automatically generated by tmake at 18:19, 1999/10/06 # This file was automatically generated by tmake at 11:14, 1999/10/09
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
# #
@@ -201,7 +201,6 @@ WX_HEADERS = \
debug.h \ debug.h \
defs.h \ defs.h \
dialog.h \ dialog.h \
dialup.h \
dirdlg.h \ dirdlg.h \
dnd.h \ dnd.h \
docmdi.h \ docmdi.h \
@@ -1945,7 +1944,7 @@ DEPFILES = @ALL_DEPFILES@
HEADERS = @ALL_HEADERS@ HEADERS = @ALL_HEADERS@
all: @WX_CREATE_LINKS@ all: @WX_ALL@
@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
@$(INSTALL) -d ./lib @$(INSTALL) -d ./lib
@@ -1956,7 +1955,7 @@ all: @WX_CREATE_LINKS@
@$(INSTALL) -d ./lib @$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
CREATE_LINKS: @WX_TARGET_LIBRARY@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK1@
@$(RM) ./lib/@WX_LIBRARY_LINK2@ @$(RM) ./lib/@WX_LIBRARY_LINK2@
@$(RM) ./lib/@WX_LIBRARY_LINK3@ @$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1964,13 +1963,13 @@ CREATE_LINKS: @WX_TARGET_LIBRARY@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
$(RM) $(libdir)/@WX_LIBRARY_LINK1@ $(RM) $(libdir)/@WX_LIBRARY_LINK1@
$(RM) $(libdir)/@WX_LIBRARY_LINK2@ $(RM) $(libdir)/@WX_LIBRARY_LINK2@
$(RM) $(libdir)/@WX_LIBRARY_LINK3@ $(RM) $(libdir)/@WX_LIBRARY_LINK3@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
@@ -2047,7 +2046,7 @@ write_message:
@echo " Read the wxWindows Licence on licencing conditions." @echo " Read the wxWindows Licence on licencing conditions."
@echo " " @echo " "
install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message install: preinstall @WX_ALL_INSTALLED@ write_message
uninstall: uninstall:
@echo " " @echo " "

48
configure.in
View File

@@ -1714,23 +1714,25 @@ WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
dnl shared library settings dnl shared library settings
SHARED_LD= SHARED_LD=
PIC_FLAG= PIC_FLAG=
WX_CREATE_LINKS= WX_ALL=
WX_ALL_INSTALLED=
if test "$wxUSE_SHARED" = "yes"; then if test "$wxUSE_SHARED" = "yes"; then
dnl set target to shared dnl set target to shared
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
case "${host}" in case "${host}" in
*-hp-hpux* ) *-hp-hpux* )
WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
SHARED_LD="${CXX} -b -o" SHARED_LD="${CXX} -b -o"
PIC_FLAG="+Z" PIC_FLAG="+Z"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;; ;;
*-*-linux* ) *-*-linux* )
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-irix5* | *-*-irix6* ) *-*-irix5* | *-*-irix6* )
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
@@ -1739,8 +1741,8 @@ case "${host}" in
else else
SHARED_LD="${CXX} -shared -o" SHARED_LD="${CXX} -shared -o"
fi fi
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-solaris2* ) *-*-solaris2* )
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
@@ -1750,59 +1752,63 @@ case "${host}" in
SHARED_LD="${CXX} -G -o" SHARED_LD="${CXX} -G -o"
PIC_FLAG="PIC" PIC_FLAG="PIC"
fi fi
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-sunos4* ) *-*-sunos4* )
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-freebsd* | *-*-netbsd*) *-*-freebsd* | *-*-netbsd*)
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-osf* ) *-*-osf* )
SHARED_LD="${CXX} -shared -o" SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-dgux5* ) *-*-dgux5* )
SHARED_LD="${CXX} -shared -o" SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-sysv5* ) *-*-sysv5* )
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC" PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS" WX_ALL="CREATE_LINKS"
;; ;;
*-*-aix* ) *-*-aix* )
SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;; ;;
*-*-cygwin32* ) *-*-cygwin32* )
dnl only static for now dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
;; ;;
*-*-mingw32* ) *-*-mingw32* )
dnl only static for now dnl only static for now
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
;; ;;
*-pc-os2_emx ) *-pc-os2_emx )
;; ;;
*) *)
AC_MSG_ERROR(unknown system type ${host}.) AC_MSG_ERROR(unknown system type ${host}.)
esac esac
else else
dnl set target to static dnl set target to static
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
fi fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
@@ -2856,8 +2862,8 @@ AC_SUBST(WX_LIBRARY_LINK3)
AC_SUBST(PROGRAM_EXT) AC_SUBST(PROGRAM_EXT)
dnl are we supposed to create the links? dnl are we supposed to create the links?
AC_SUBST(WX_CREATE_LINKS) AC_SUBST(WX_ALL)
AC_SUBST(WX_CREATE_INSTALLED_LINKS) AC_SUBST(WX_ALL_INSTALLED)
AC_SUBST(SHARED_LD) AC_SUBST(SHARED_LD)
AC_SUBST(PIC_FLAG) AC_SUBST(PIC_FLAG)

14
distrib/msw/tmake/unx.t
View File

@@ -503,7 +503,7 @@ DEPFILES = @ALL_DEPFILES@
HEADERS = @ALL_HEADERS@ HEADERS = @ALL_HEADERS@
all: @WX_CREATE_LINKS@ all: @WX_ALL@
@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) @WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
@$(INSTALL) -d ./lib @$(INSTALL) -d ./lib
@@ -514,7 +514,7 @@ all: @WX_CREATE_LINKS@
@$(INSTALL) -d ./lib @$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
CREATE_LINKS: @WX_TARGET_LIBRARY@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
@$(RM) ./lib/@WX_LIBRARY_LINK1@ @$(RM) ./lib/@WX_LIBRARY_LINK1@
@$(RM) ./lib/@WX_LIBRARY_LINK2@ @$(RM) ./lib/@WX_LIBRARY_LINK2@
@$(RM) ./lib/@WX_LIBRARY_LINK3@ @$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -522,13 +522,13 @@ CREATE_LINKS: @WX_TARGET_LIBRARY@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@
$(RM) $(libdir)/@WX_LIBRARY_LINK1@ $(RM) $(libdir)/@WX_LIBRARY_LINK1@
$(RM) $(libdir)/@WX_LIBRARY_LINK2@ $(RM) $(libdir)/@WX_LIBRARY_LINK2@
$(RM) $(libdir)/@WX_LIBRARY_LINK3@ $(RM) $(libdir)/@WX_LIBRARY_LINK3@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
@@ -605,7 +605,7 @@ write_message:
@echo " Read the wxWindows Licence on licencing conditions." @echo " Read the wxWindows Licence on licencing conditions."
@echo " " @echo " "
install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message install: preinstall @WX_ALL_INSTALLED@ write_message
uninstall: uninstall:
@echo " " @echo " "

2
src/gtk/dcclient.cpp
View File

@@ -211,7 +211,7 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2,
long yyc = YLOG2DEV(yc); long yyc = YLOG2DEV(yc);
double dx = xx1 - xxc; double dx = xx1 - xxc;
double dy = yy1 - yyc; double dy = yy1 - yyc;
double radius = sqrt(dx*dx+dy*dy); double radius = sqrt((double)(dx*dx+dy*dy));
long r = (long)radius; long r = (long)radius;
double radius1, radius2; double radius1, radius2;

2
src/gtk1/dcclient.cpp
View File

@@ -211,7 +211,7 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2,
long yyc = YLOG2DEV(yc); long yyc = YLOG2DEV(yc);
double dx = xx1 - xxc; double dx = xx1 - xxc;
double dy = yy1 - yyc; double dy = yy1 - yyc;
double radius = sqrt(dx*dx+dy*dy); double radius = sqrt((double)(dx*dx+dy*dy));
long r = (long)radius; long r = (long)radius;
double radius1, radius2; double radius1, radius2;

2
src/html/m_image.cpp
View File

@@ -107,7 +107,7 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
l = coords[ 0 ]; l = coords[ 0 ];
t = coords[ 1 ]; t = coords[ 1 ];
r = coords[ 2 ]; r = coords[ 2 ];
d = sqrt( ((x - l) * (x - l)) + ((y - t) * (y - t)) ); d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );
if (d < (double)r) if (d < (double)r)
{ {
return m_Link; return m_Link;