mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-02-15 05:55:49 +00:00
first guess at per pixel non matrix user params
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@399 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
@ -10,17 +10,28 @@
|
||||
<projectname>projectmDev10</projectname>
|
||||
<projectdirectory>../../</projectdirectory>
|
||||
<absoluteprojectpath>false</absoluteprojectpath>
|
||||
<<<<<<< .mine
|
||||
<description></description>
|
||||
<defaultencoding/>
|
||||
=======
|
||||
<description></description>
|
||||
<defaultencoding></defaultencoding>
|
||||
>>>>>>> .r389
|
||||
<versioncontrol>kdevsubversion</versioncontrol>
|
||||
</general>
|
||||
<kdevcustomproject>
|
||||
<run>
|
||||
<directoryradio>custom</directoryradio>
|
||||
<mainprogram>/usr/local/bin/xmms</mainprogram>
|
||||
<<<<<<< .mine
|
||||
<programargs></programargs>
|
||||
<globaldebugarguments/>
|
||||
<globalcwd/>
|
||||
=======
|
||||
<programargs></programargs>
|
||||
<globaldebugarguments></globaldebugarguments>
|
||||
<globalcwd>/home/pete/trunk/src</globalcwd>
|
||||
>>>>>>> .r389
|
||||
<useglobalprogram>false</useglobalprogram>
|
||||
<terminal>false</terminal>
|
||||
<autocompile>true</autocompile>
|
||||
@ -48,7 +59,11 @@
|
||||
<blacklist/>
|
||||
<build>
|
||||
<buildtool>make</buildtool>
|
||||
<<<<<<< .mine
|
||||
<builddir>/home/carm/projects/trunk/src/projectM-engine</builddir>
|
||||
=======
|
||||
<builddir>/home/pete/trunk/src/projectM-engine</builddir>
|
||||
>>>>>>> .r389
|
||||
</build>
|
||||
<other>
|
||||
<prio>0</prio>
|
||||
@ -84,7 +99,7 @@
|
||||
<breakonloadinglibs>true</breakonloadinglibs>
|
||||
<separatetty>false</separatetty>
|
||||
<floatingtoolbar>false</floatingtoolbar>
|
||||
<programargs/>
|
||||
<programargs></programargs>
|
||||
</general>
|
||||
<display>
|
||||
<staticmembers>true</staticmembers>
|
||||
@ -218,9 +233,9 @@
|
||||
</kdevfileview>
|
||||
<kdevdocumentation>
|
||||
<projectdoc>
|
||||
<docsystem/>
|
||||
<docurl/>
|
||||
<usermanualurl/>
|
||||
<docsystem></docsystem>
|
||||
<docurl></docurl>
|
||||
<usermanualurl></usermanualurl>
|
||||
</projectdoc>
|
||||
</kdevdocumentation>
|
||||
<ctagspart>
|
||||
|
||||
@ -1,56 +1,48 @@
|
||||
<?xml version = '1.0' encoding = 'UTF-8'?>
|
||||
<!DOCTYPE KDevPrjSession>
|
||||
<KDevPrjSession>
|
||||
<DocsAndViews NumberOfDocuments="15" >
|
||||
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Preset.cpp" >
|
||||
<View0 line="382" Type="Source" />
|
||||
<DocsAndViews NumberOfDocuments="11" >
|
||||
<Doc0 NumberOfViews="1" URL="file:///usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g%2B%2B-v4/bits/stl_tree.h" >
|
||||
<View0 Type="Source" />
|
||||
</Doc0>
|
||||
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Preset.hpp" >
|
||||
<View0 line="137" Type="Source" />
|
||||
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/Parser.hpp" >
|
||||
<View0 Type="Source" />
|
||||
</Doc1>
|
||||
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/ParamUtils.hpp" >
|
||||
<View0 line="64" Type="Source" />
|
||||
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/Parser.cpp" >
|
||||
<View0 Type="Source" />
|
||||
</Doc2>
|
||||
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/projectM.cpp" >
|
||||
<View0 line="133" Type="Source" />
|
||||
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/Preset.cpp" >
|
||||
<View0 line="428" Type="Source" />
|
||||
</Doc3>
|
||||
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/CustomWave.cpp" >
|
||||
<View0 line="542" Type="Source" />
|
||||
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/Preset.hpp" >
|
||||
<View0 line="44" Type="Source" />
|
||||
</Doc4>
|
||||
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/CustomWave.hpp" >
|
||||
<View0 line="131" Type="Source" />
|
||||
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/IdlePreset.hpp" >
|
||||
<View0 line="10" Type="Source" />
|
||||
</Doc5>
|
||||
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/InitCondUtils.hpp" >
|
||||
<View0 line="69" Type="Source" />
|
||||
<Doc6 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/CMakeLists.txt" >
|
||||
<View0 Type="Source" />
|
||||
</Doc6>
|
||||
<Doc7 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Renderer.cpp" >
|
||||
<View0 line="1521" Type="Source" />
|
||||
<Doc7 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/projectM.cpp" >
|
||||
<View0 Type="Source" />
|
||||
</Doc7>
|
||||
<Doc8 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-xmms/main.cpp" >
|
||||
<View0 line="272" Type="Source" />
|
||||
<Doc8 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/console_interface.cpp" >
|
||||
<View0 Type="Source" />
|
||||
</Doc8>
|
||||
<Doc9 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Parser.cpp" >
|
||||
<View0 line="1401" Type="Source" />
|
||||
<Doc9 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/IdlePreset.cpp" >
|
||||
<View0 line="136" Type="Source" />
|
||||
</Doc9>
|
||||
<Doc10 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Param.cpp" >
|
||||
<View0 line="122" Type="Source" />
|
||||
<Doc10 NumberOfViews="1" URL="file:///home/carm/projects/trunk/src/projectM-engine/BuiltinParams.cpp" >
|
||||
<View0 line="22" Type="Source" />
|
||||
</Doc10>
|
||||
<Doc11 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/Param.hpp" >
|
||||
<View0 line="84" Type="Source" />
|
||||
</Doc11>
|
||||
<Doc12 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/CustomShape.cpp" >
|
||||
<View0 line="218" Type="Source" />
|
||||
</Doc12>
|
||||
<Doc13 NumberOfViews="1" URL="file:///home/carm/projects/dev-1.0/src/projectM-engine/InitCond.cpp" >
|
||||
<View0 line="76" Type="Source" />
|
||||
</Doc13>
|
||||
<Doc14 NumberOfViews="1" URL="file:///usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g%2B%2B-v4/bits/stl_tree.h" >
|
||||
<View0 line="591" Type="Source" />
|
||||
</Doc14>
|
||||
</DocsAndViews>
|
||||
<pluginList>
|
||||
<kdevdebugger>
|
||||
<breakpointList/>
|
||||
<breakpointList>
|
||||
<breakpoint0 location="/home/carm/projects/trunk/src/projectM-engine/IdlePreset.cpp:129" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
|
||||
<tracedExpressions/>
|
||||
</breakpoint0>
|
||||
</breakpointList>
|
||||
</kdevdebugger>
|
||||
<kdevbookmarks>
|
||||
<bookmarks>
|
||||
|
||||
@ -466,7 +466,7 @@ CustomWave::~CustomWave()
|
||||
|
||||
|
||||
|
||||
// Comments: index is not passed, so we assume monotic increment by 1 is ok here
|
||||
// Comments: index is not passed, so we assume monotonic increment by 1 is ok here
|
||||
int CustomWave::add_per_point_eqn(char * name, GenExpr * gen_expr)
|
||||
{
|
||||
|
||||
@ -558,7 +558,6 @@ void CustomWave::evalPerPointEqns()
|
||||
/* Evaluate per pixel equations */
|
||||
for (k = 0; k < samples;k++)
|
||||
for (std::map<int, PerPointEqn*>::iterator pos = per_point_eqn_tree.begin(); pos != per_point_eqn_tree.end();++pos) {
|
||||
|
||||
pos->second->evaluate(k);
|
||||
}
|
||||
|
||||
|
||||
@ -60,12 +60,13 @@ void InitCond::evaluate() {
|
||||
assert(this);
|
||||
assert(param);
|
||||
|
||||
/* Parameter is of boolean type, either a 1 or 0 value integer */
|
||||
/* Set matrix flag to zero. This ensures
|
||||
/* Set matrix flag to zero. This ensures
|
||||
its constant value will be used rather than a matrix value
|
||||
*/
|
||||
|
||||
param->matrix_flag = false;
|
||||
param->matrix_flag = false;
|
||||
|
||||
/* Parameter is of boolean type, either true/false */
|
||||
|
||||
if (param->type == P_TYPE_BOOL) {
|
||||
|
||||
// printf( "init_cond: %s = %d (TYPE BOOL)\n", param->name.c_str(), init_val.bool_val);
|
||||
|
||||
@ -107,7 +107,7 @@ token_t Parser::parseToken(std::istream & fs, char * string) {
|
||||
if (c == '/') {
|
||||
while (true) {
|
||||
if (!fs || fs.eof())
|
||||
c= EOF;
|
||||
c = EOF;
|
||||
else
|
||||
c = fs.get();
|
||||
if (c == EOF) {
|
||||
@ -161,6 +161,7 @@ token_t Parser::parseToken(std::istream & fs, char * string) {
|
||||
if (!fs || fs.eof()) {
|
||||
line_count = 1;
|
||||
line_mode= NORMAL_LINE_MODE;
|
||||
std::cerr << "token wrap: end of file" << std::endl;
|
||||
return tEOF;
|
||||
}
|
||||
|
||||
@ -349,7 +350,6 @@ int Parser::parse_line(std::istream & fs, Preset * preset) {
|
||||
token_t token;
|
||||
InitCond * init_cond;
|
||||
PerFrameEqn * per_frame_eqn;
|
||||
//PerFrameEqn * per_frame_init_eqn;
|
||||
|
||||
/* Clear the string line buffer */
|
||||
memset(string_line_buffer, 0, STRING_LINE_SIZE);
|
||||
@ -372,7 +372,9 @@ int Parser::parse_line(std::istream & fs, Preset * preset) {
|
||||
case tAnd:
|
||||
case tDiv:
|
||||
|
||||
// if (PARSE_DEBUG) printf("parse_line: invalid token found at start of line (LINE %d)\n", line_count);
|
||||
if (PARSE_DEBUG) std::cerr << "parse_line: invalid token found at start of line (LINE "
|
||||
<< line_count << ")" << std::endl;
|
||||
|
||||
/* Invalid token found, return a parse error */
|
||||
return PROJECTM_PARSE_ERROR;
|
||||
|
||||
@ -384,9 +386,11 @@ int Parser::parse_line(std::istream & fs, Preset * preset) {
|
||||
case tEOF: /* End of File */
|
||||
line_mode = NORMAL_LINE_MODE;
|
||||
line_count = 1;
|
||||
tokenWrapAroundEnabled = false;
|
||||
return EOF;
|
||||
|
||||
case tSemiColon: /* Indicates end of expression */
|
||||
tokenWrapAroundEnabled = false;
|
||||
return PROJECTM_SUCCESS;
|
||||
|
||||
/* Valid Case, either an initial condition or equation should follow */
|
||||
@ -587,6 +591,7 @@ int Parser::parse_line(std::istream & fs, Preset * preset) {
|
||||
if (PARSE_DEBUG) printf("unsupported line mode: CUSTOM_SHAPE_SHAPECODE_LINE_MODE\n");
|
||||
return PROJECTM_FAILURE;
|
||||
} else if (line_mode == CUSTOM_SHAPE_PER_FRAME_LINE_MODE) {
|
||||
tokenWrapAroundEnabled = true;
|
||||
|
||||
CustomShape * custom_shape;
|
||||
|
||||
@ -652,7 +657,7 @@ GenExpr * Parser::parse_gen_expr ( std::istream & fs, TreeExpr * tree_expr, Pre
|
||||
switch (token = parseToken(fs,string)) {
|
||||
/* Left Parentice Case */
|
||||
case tLPr:
|
||||
std::cerr << "token before tLPr:" << string << std::endl;
|
||||
//std::cerr << "token before tLPr:" << string << std::endl;
|
||||
/* CASE 1 (Left Parentice): See if the previous string before this parentice is a function name */
|
||||
if ((func = BuiltinFuncs::find_func(string)) != NULL) {
|
||||
if (PARSE_DEBUG) {
|
||||
@ -701,7 +706,7 @@ GenExpr * Parser::parse_gen_expr ( std::istream & fs, TreeExpr * tree_expr, Pre
|
||||
/* Case 2: (Left Parentice), a string coupled with a left parentice. Either an error or implicit
|
||||
multiplication operator. For now treat it as an error */
|
||||
if (*string != 0) {
|
||||
std::cerr << "toke n prefix is " << *string << std::endl;
|
||||
std::cerr << "token prefix is " << *string << std::endl;
|
||||
if (PARSE_DEBUG) printf("parse_gen_expr: implicit multiplication case unimplemented!\n");
|
||||
if (tree_expr)
|
||||
delete tree_expr;
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
#include "wipemalloc.h"
|
||||
#include <cassert>
|
||||
/* Evaluates a per pixel equation */
|
||||
void PerPixelEqn::evaluate() {
|
||||
void PerPixelEqn::evaluate(int mesh_i, int mesh_j) {
|
||||
|
||||
GenExpr * eqn_ptr = 0;
|
||||
int x,y;
|
||||
@ -47,30 +47,19 @@ void PerPixelEqn::evaluate() {
|
||||
float ** param_matrix = (float**)this->param->matrix;
|
||||
|
||||
if (param_matrix == 0) {
|
||||
if (PER_PIXEL_EQN_DEBUG) printf("evalPerPixelEqn: [begin initializing matrix] (index = %d) (name = %s)\n",
|
||||
index, param->name.c_str());
|
||||
(*(float*)param->engine_val) = eqn_ptr->eval_gen_expr(mesh_i, mesh_j);
|
||||
|
||||
param_matrix = (float**)wipemalloc(param->gx*sizeof(float*));
|
||||
for(x = 0; x < param->gx; x++)
|
||||
param_matrix[x] = (float *)wipemalloc(param->gy * sizeof(float));
|
||||
|
||||
for (x = 0; x < param->gx; x++)
|
||||
for (y = 0; y < param->gy; y++) {
|
||||
/// @slow is this necessary?
|
||||
param_matrix[x][y] = 0.0;
|
||||
}
|
||||
this->param->matrix = param_matrix;
|
||||
}
|
||||
} else {
|
||||
|
||||
assert(!(eqn_ptr == NULL || param_matrix == NULL));
|
||||
|
||||
// param->matrix_flag = 0; /** Force matrix ignore to update time */
|
||||
for (int mesh_i = 0; mesh_i < param->gx; mesh_i++) {
|
||||
for (int mesh_j = 0; mesh_j < param->gy; mesh_j++) {
|
||||
// for (int mesh_i = 0; mesh_i < param->gx; mesh_i++) {
|
||||
// for (int mesh_j = 0; mesh_j < param->gy; mesh_j++) {
|
||||
// std::cout << "gx,gy is " << param->gx << "," << param->gy << std::endl;
|
||||
param_matrix[mesh_i][mesh_j] = eqn_ptr->eval_gen_expr(mesh_i, mesh_j);
|
||||
}
|
||||
}
|
||||
// }
|
||||
|
||||
|
||||
/* Now that this parameter has been referenced with a per
|
||||
pixel equation, we let the evaluator know by setting
|
||||
@ -78,6 +67,7 @@ void PerPixelEqn::evaluate() {
|
||||
/// @bug review and verify this behavior
|
||||
param->matrix_flag = true;
|
||||
param->flags |= P_FLAG_PER_PIXEL;
|
||||
}
|
||||
}
|
||||
|
||||
PerPixelEqn::PerPixelEqn(int _index, Param * _param, GenExpr * _gen_expr):index(_index), param(_param), gen_expr(_gen_expr) {
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
GenExpr *gen_expr;
|
||||
|
||||
void evalPerPixelEqns( Preset *preset );
|
||||
void evaluate();
|
||||
void evaluate(int mesh_i, int mesh_j);
|
||||
|
||||
PerPixelEqn(int index, Param * param, GenExpr * gen_expr);
|
||||
|
||||
|
||||
@ -41,7 +41,9 @@
|
||||
Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
|
||||
builtinParams(presetInputs, presetOutputs),
|
||||
file_path("[Input Stream]"),
|
||||
m_presetOutputs(presetOutputs)
|
||||
m_presetOutputs(presetOutputs),
|
||||
m_presetInputs(presetInputs)
|
||||
|
||||
{
|
||||
|
||||
m_presetOutputs.customWaves.clear();
|
||||
@ -56,7 +58,8 @@ Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutpu
|
||||
Preset::Preset(const std::string & filename, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
|
||||
builtinParams(presetInputs, presetOutputs),
|
||||
file_path(filename),
|
||||
m_presetOutputs(presetOutputs)
|
||||
m_presetOutputs(presetOutputs),
|
||||
m_presetInputs(presetInputs)
|
||||
{
|
||||
|
||||
m_presetOutputs.customWaves.clear();
|
||||
@ -380,7 +383,7 @@ void Preset::loadCustomShapeUnspecInitConds()
|
||||
void Preset::evaluateFrame()
|
||||
{
|
||||
|
||||
/* Evaluate all equation objects in same order as the renderer */
|
||||
/* Evaluate all equation objects according to milkdrop flow diagram */
|
||||
|
||||
evalPerFrameEquations();
|
||||
evalPerPixelEqns();
|
||||
@ -400,16 +403,16 @@ void Preset::evalPerPixelEqns()
|
||||
{
|
||||
|
||||
/* Evaluate all per pixel equations in the tree datastructure */
|
||||
for (int mesh_x = 0; mesh_x < m_presetInputs.gx; mesh_x++)
|
||||
for (int mesh_y = 0; mesh_y < m_presetInputs.gy; mesh_y++)
|
||||
for (std::map<int, PerPixelEqn*>::iterator pos = per_pixel_eqn_tree.begin();
|
||||
pos != per_pixel_eqn_tree.end(); ++pos)
|
||||
pos->second->evaluate();
|
||||
pos->second->evaluate(mesh_x, mesh_y);
|
||||
|
||||
}
|
||||
|
||||
int Preset::readIn(std::istream & fs) {
|
||||
|
||||
|
||||
|
||||
line_mode_t line_mode;
|
||||
|
||||
/* Parse any comments */
|
||||
@ -432,9 +435,6 @@ int Preset::readIn(std::istream & fs) {
|
||||
|
||||
std::cerr << "[Preset::readIn] preset \"" << this->name << "\" parsed." << std::endl;;
|
||||
|
||||
// Start line counter at zero
|
||||
int lineno = 0;
|
||||
|
||||
// Loop through each line in file, trying to succesfully parse the file.
|
||||
// If a line does not parse correctly, keep trucking along to next line.
|
||||
int retval;
|
||||
@ -445,7 +445,6 @@ int Preset::readIn(std::istream & fs) {
|
||||
line_mode = NORMAL_LINE_MODE;
|
||||
std::cerr << "[Preset::readIn()] parse error in file \"" << this->absoluteFilePath() << "\"" << std::endl;
|
||||
}
|
||||
lineno++;
|
||||
}
|
||||
|
||||
std::cerr << "loadPresetFile: finished line parsing successfully" << std::endl;
|
||||
|
||||
@ -160,6 +160,7 @@ private:
|
||||
void postloadInitialize();
|
||||
|
||||
PresetOutputs & m_presetOutputs;
|
||||
const PresetInputs & m_presetInputs; // added for gx, gy reference.
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -66,12 +66,12 @@ fast_install=yes
|
||||
|
||||
# The host system.
|
||||
host_alias=
|
||||
host=x86_64-unknown-linux-gnu
|
||||
host=i686-pc-linux-gnu
|
||||
host_os=linux-gnu
|
||||
|
||||
# The build system.
|
||||
build_alias=
|
||||
build=x86_64-unknown-linux-gnu
|
||||
build=i686-pc-linux-gnu
|
||||
build_os=linux-gnu
|
||||
|
||||
# An echo program that does not interpret backslashes.
|
||||
@ -97,7 +97,7 @@ with_gcc=yes
|
||||
EGREP="/bin/grep -E"
|
||||
|
||||
# The linker used to build libraries.
|
||||
LD="/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64"
|
||||
LD="/usr/i686-pc-linux-gnu/bin/ld"
|
||||
|
||||
# Whether we need hard or soft links.
|
||||
LN_S="ln -s"
|
||||
@ -325,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
|
||||
link_all_deplibs=unknown
|
||||
|
||||
# Compile-time system search path for libraries
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib64 /lib64 /usr/x86_64-pc-linux-gnu/lib"
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
|
||||
|
||||
# Run-time system search path for libraries
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr/lib32/opengl/nvidia/lib //usr/lib64/opengl/nvidia/lib /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib64 /lib32 /usr/lib32 /usr/local/lib32 /usr/x86_64-pc-linux-gnu/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0/32 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6/32 /usr/lib64/nspr /usr/lib64/nss /usr/lib64/openmotif-2.2 /usr/lib32/openmotif-2.2 /usr/lib/qt4 /usr/lib64/qt4 /usr/lib32/qt4 /usr/kde/3.5/lib /usr/kde/3.5/lib64 /usr/kde/3.5/lib32 /usr/qt/3/lib /usr/qt/3/lib64 /usr/qt/3/lib32 /opt/firefox /usr/games/lib /usr/games/lib32 /usr/lib/octave-2.1.73 "
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
|
||||
|
||||
# Fix the shell variable $srcfile for the compiler.
|
||||
fix_srcfile_path=""
|
||||
@ -7368,12 +7368,12 @@ fast_install=yes
|
||||
|
||||
# The host system.
|
||||
host_alias=
|
||||
host=x86_64-unknown-linux-gnu
|
||||
host=i686-pc-linux-gnu
|
||||
host_os=linux-gnu
|
||||
|
||||
# The build system.
|
||||
build_alias=
|
||||
build=x86_64-unknown-linux-gnu
|
||||
build=i686-pc-linux-gnu
|
||||
build_os=linux-gnu
|
||||
|
||||
# An echo program that does not interpret backslashes.
|
||||
@ -7399,7 +7399,7 @@ with_gcc=yes
|
||||
EGREP="/bin/grep -E"
|
||||
|
||||
# The linker used to build libraries.
|
||||
LD="/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64"
|
||||
LD="/usr/i686-pc-linux-gnu/bin/ld"
|
||||
|
||||
# Whether we need hard or soft links.
|
||||
LN_S="ln -s"
|
||||
@ -7528,11 +7528,11 @@ striplib="strip --strip-unneeded"
|
||||
|
||||
# Dependencies to place before the objects being linked to create a
|
||||
# shared library.
|
||||
predep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../lib64/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/crtbeginS.o"
|
||||
predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/crtbeginS.o"
|
||||
|
||||
# Dependencies to place after the objects being linked to create a
|
||||
# shared library.
|
||||
postdep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../lib64/crtn.o"
|
||||
postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/crtendS.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../crtn.o"
|
||||
|
||||
# Dependencies to place before the objects being linked to create a
|
||||
# shared library.
|
||||
@ -7544,7 +7544,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
|
||||
|
||||
# The library search path used internally by the compiler when linking
|
||||
# a shared library.
|
||||
compiler_lib_search_path="-L/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../../../x86_64-pc-linux-gnu/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/../../.."
|
||||
compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../.."
|
||||
|
||||
# Method to check whether dependent libraries are shared objects.
|
||||
deplibs_check_method="pass_all"
|
||||
@ -7624,10 +7624,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
|
||||
link_all_deplibs=unknown
|
||||
|
||||
# Compile-time system search path for libraries
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib64 /lib64 /usr/x86_64-pc-linux-gnu/lib"
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
|
||||
|
||||
# Run-time system search path for libraries
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr/lib32/opengl/nvidia/lib //usr/lib64/opengl/nvidia/lib /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib64 /lib32 /usr/lib32 /usr/local/lib32 /usr/x86_64-pc-linux-gnu/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0/32 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6/32 /usr/lib64/nspr /usr/lib64/nss /usr/lib64/openmotif-2.2 /usr/lib32/openmotif-2.2 /usr/lib/qt4 /usr/lib64/qt4 /usr/lib32/qt4 /usr/kde/3.5/lib /usr/kde/3.5/lib64 /usr/kde/3.5/lib32 /usr/qt/3/lib /usr/qt/3/lib64 /usr/qt/3/lib32 /opt/firefox /usr/games/lib /usr/games/lib32 /usr/lib/octave-2.1.73 "
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
|
||||
|
||||
# Fix the shell variable $srcfile for the compiler.
|
||||
fix_srcfile_path=""
|
||||
@ -7673,12 +7673,12 @@ fast_install=yes
|
||||
|
||||
# The host system.
|
||||
host_alias=
|
||||
host=x86_64-unknown-linux-gnu
|
||||
host=i686-pc-linux-gnu
|
||||
host_os=linux-gnu
|
||||
|
||||
# The build system.
|
||||
build_alias=
|
||||
build=x86_64-unknown-linux-gnu
|
||||
build=i686-pc-linux-gnu
|
||||
build_os=linux-gnu
|
||||
|
||||
# An echo program that does not interpret backslashes.
|
||||
@ -7704,7 +7704,7 @@ with_gcc=yes
|
||||
EGREP="/bin/grep -E"
|
||||
|
||||
# The linker used to build libraries.
|
||||
LD="/usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64"
|
||||
LD="/usr/i686-pc-linux-gnu/bin/ld"
|
||||
|
||||
# Whether we need hard or soft links.
|
||||
LN_S="ln -s"
|
||||
@ -7932,10 +7932,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
|
||||
link_all_deplibs=unknown
|
||||
|
||||
# Compile-time system search path for libraries
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib64 /lib64 /usr/x86_64-pc-linux-gnu/lib"
|
||||
sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/i686-pc-linux-gnu/lib /usr/lib /lib"
|
||||
|
||||
# Run-time system search path for libraries
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr/lib32/opengl/nvidia/lib //usr/lib64/opengl/nvidia/lib /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib64 /lib32 /usr/lib32 /usr/local/lib32 /usr/x86_64-pc-linux-gnu/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2 /usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0 /usr/lib/gcc/x86_64-pc-linux-gnu/4.2.0/32 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6 /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.6/32 /usr/lib64/nspr /usr/lib64/nss /usr/lib64/openmotif-2.2 /usr/lib32/openmotif-2.2 /usr/lib/qt4 /usr/lib64/qt4 /usr/lib32/qt4 /usr/kde/3.5/lib /usr/kde/3.5/lib64 /usr/kde/3.5/lib32 /usr/qt/3/lib /usr/qt/3/lib64 /usr/qt/3/lib32 /opt/firefox /usr/games/lib /usr/games/lib32 /usr/lib/octave-2.1.73 "
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.2 /usr/lib/gcc/i686-pc-linux-gnu/4.2.0 /usr/lib/nspr /usr/lib/nss /usr/lib/openmotif-2.2 /usr/lib/qt4 /usr/kde/3.5/lib /usr/qt/3/lib /usr/games/lib /usr/lib/fltk-1.1 /usr/lib/libstdc++-v3/ "
|
||||
|
||||
# Fix the shell variable $srcfile for the compiler.
|
||||
fix_srcfile_path=""
|
||||
|
||||
Reference in New Issue
Block a user