User:Robin Cornelius/http texture on 64bit: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
|||
| (One intermediate revision by the same user not shown) | |||
| Line 25: | Line 25: | ||
===Some minor 64 bit issues=== | ===Some minor 64 bit issues=== | ||
diff -r bb9fb6dc7f44 indra/llui/lltextparser.cpp | diff -r bb9fb6dc7f44 indra/llui/lltextparser.cpp | ||
--- a/indra/llui/lltextparser.cpp Fri Apr 03 14:32:44 2009 -0700 | --- a/indra/llui/lltextparser.cpp Fri Apr 03 14:32:44 2009 -0700 | ||
+++ b/indra/llui/lltextparser.cpp Thu Apr 09 12:16:09 2009 +0100 | +++ b/indra/llui/lltextparser.cpp Thu Apr 09 12:16:09 2009 +0100 | ||
@@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
pattern= utf8str_tolower(pattern); | |||
} | |||
- S32 found=std::string::npos; | |||
+ size_t found=std::string::npos; | |||
switch ((S32)highlight["condition"]) | |||
{ | |||
diff -r bb9fb6dc7f44 indra/newview/llappviewerlinux.cpp | |||
--- a/indra/newview/llappviewerlinux.cpp Fri Apr 03 14:32:44 2009 -0700 | |||
+++ b/indra/newview/llappviewerlinux.cpp Thu Apr 09 12:16:09 2009 +0100 | |||
@@ -257,7 +257,7 @@ | |||
size_t btpos; | |||
diff -r bb9fb6dc7f44 indra/newview/llappviewerlinux.cpp | for (btpos = 0; btpos < btsize; ++btpos) | ||
--- a/indra/newview/llappviewerlinux.cpp Fri Apr 03 14:32:44 2009 -0700 | { | ||
+++ b/indra/newview/llappviewerlinux.cpp Thu Apr 09 12:16:09 2009 +0100 | - fprintf(StraceFile, "%d:\t", btpos); | ||
@@ -257,7 +257,7 @@ | + fprintf(StraceFile, "%ld:\t", (long)btpos); | ||
int symidx; | |||
for (symidx = 0; symidx < nSymNo; ++symidx) | |||
{ | |||
- fprintf(StraceFile, "%d:\t", btpos); | |||
+ fprintf(StraceFile, "%ld:\t", (long)btpos); | |||
Latest revision as of 05:16, 9 April 2009
Rough notes for trying to build the http texture branch in a non standalone configuration on a 64bit linux host
I'm assuming you have appropriate -dev packages installed already on your system, locations based on a Debian system.
Gtk, Glib and friends
cp /usr/include/glib-2.0/* libraries/includes/ -r cp /usr/include/gtk-2.0/* libraries/includes/ -r cp /usr/include/pango-1.0/* libraries/includes/ -r cp /usr/include/atk-1.0/* libraries/includes/ -r cp /usr/include/cairo-1.0/* libraries/includes/ -r cp /usr/lib/glib-2.0/include/glibconfig.h libraries/includes/ cp /usr/lib/gtk-2.0/include/glibconfig.h libraries/includes/
dbus
cp /usr/include/dbus-1.0/* libraries/includes/ -r
ndofdev
ndofdev_external.h is needed from the ndof source
cp $libndofsrc/ndofdev_external.h ../libraries/include/ cp $libndofsrc/libndofdev.a libraries/x86_64-linux/lib_release_client/
ELFIO
mkdir libraries/includes/ELFIO cp $elfiosrc/ELFIO/*.h libraries/includes/ELFIO -r cp $elfiosrc/ELFIO/libELFIO.a ../libraries/x86_64-linux/lib_release_client/
Code changes needed
Some minor 64 bit issues
diff -r bb9fb6dc7f44 indra/llui/lltextparser.cpp
--- a/indra/llui/lltextparser.cpp Fri Apr 03 14:32:44 2009 -0700
+++ b/indra/llui/lltextparser.cpp Thu Apr 09 12:16:09 2009 +0100
@@ -122,7 +122,7 @@
pattern= utf8str_tolower(pattern);
}
- S32 found=std::string::npos;
+ size_t found=std::string::npos;
switch ((S32)highlight["condition"])
{
diff -r bb9fb6dc7f44 indra/newview/llappviewerlinux.cpp
--- a/indra/newview/llappviewerlinux.cpp Fri Apr 03 14:32:44 2009 -0700
+++ b/indra/newview/llappviewerlinux.cpp Thu Apr 09 12:16:09 2009 +0100
@@ -257,7 +257,7 @@
size_t btpos;
for (btpos = 0; btpos < btsize; ++btpos)
{
- fprintf(StraceFile, "%d:\t", btpos);
+ fprintf(StraceFile, "%ld:\t", (long)btpos);
int symidx;
for (symidx = 0; symidx < nSymNo; ++symidx)
{