Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1816 in orxonox.OLD for orxonox/branches


Ignore:
Timestamp:
Apr 13, 2004, 11:26:09 PM (21 years ago)
Author:
bensch
Message:

orxonox/branches/bensch: added all necessary options

Location:
orxonox/branches/bensch
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/bensch/Makefile

    r1814 r1816  
    104104distuninstallcheck_listfiles = find . -type f -print
    105105distcleancheck_listfiles = find . -type f -print
    106 ACLOCAL = aclocal-1.8
     106ACLOCAL = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8
    107107ALLOCA =
    108108AMDEP_FALSE = #
    109109AMDEP_TRUE =
    110 AMTAR = tar
    111 AUTOCONF = autoconf
    112 AUTOHEADER = autoheader
    113 AUTOMAKE = automake-1.8
     110AMTAR = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar
     111AUTOCONF = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf
     112AUTOHEADER = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader
     113AUTOMAKE = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8
    114114AWK = gawk
    115115CC = gcc
    … …  
    135135LIBS =
    136136LTLIBOBJS =
    137 MAKEINFO = makeinfo
     137MAKEINFO = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo
    138138OBJEXT = o
    139139PACKAGE = orxonox

  • orxonox/branches/bensch/config.log

    r1814 r1816  
    5050configure:1404: checking whether build environment is sane
    5151configure:1447: result: yes
    52 configure:1471: WARNING: `missing' script is too old or missing
    5352configure:1504: checking for gawk
    5453configure:1520: found /bin/gawk
    … …  
    906905## ----------------- ##
    907906
    908 ACLOCAL='aclocal-1.8'
     907ACLOCAL='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8'
    909908ALLOCA=''
    910909AMDEPBACKSLASH='\'
    911910AMDEP_FALSE='#'
    912911AMDEP_TRUE=''
    913 AMTAR='tar'
    914 AUTOCONF='autoconf'
    915 AUTOHEADER='autoheader'
    916 AUTOMAKE='automake-1.8'
     912AMTAR='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar'
     913AUTOCONF='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf'
     914AUTOHEADER='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader'
     915AUTOMAKE='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8'
    917916AWK='gawk'
    918917CC='gcc'
    … …  
    938937LIBS=''
    939938LTLIBOBJS=''
    940 MAKEINFO='makeinfo'
     939MAKEINFO='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo'
    941940OBJEXT='o'
    942941PACKAGE='orxonox'
    … …  
    10501049config.status:696: creating orxonox.spec
    10511050config.status:800: creating config.h
     1051config.status:944: config.h is unchanged
    10521052config.status:1121: executing depfiles commands
    10531053
    … …  
    10631063  CONFIG_LINKS    =
    10641064  CONFIG_COMMANDS =
    1065   $ ./config.status Makefile depfiles
     1065  $ ./config.status config.h
    10661066
    10671067on iasius
    10681068
    1069 config.status:696: creating Makefile
    1070 config.status:1121: executing depfiles commands
     1069config.status:800: creating config.h
     1070config.status:944: config.h is unchanged

  • orxonox/branches/bensch/config.status

    r1814 r1816  
    491491s,@PACKAGE@,orxonox,;t t
    492492s,@VERSION@,0.0.0,;t t
    493 s,@ACLOCAL@,aclocal-1.8,;t t
    494 s,@AUTOCONF@,autoconf,;t t
    495 s,@AUTOMAKE@,automake-1.8,;t t
    496 s,@AUTOHEADER@,autoheader,;t t
    497 s,@MAKEINFO@,makeinfo,;t t
    498 s,@AMTAR@,tar,;t t
     493s,@ACLOCAL@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8,;t t
     494s,@AUTOCONF@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf,;t t
     495s,@AUTOMAKE@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8,;t t
     496s,@AUTOHEADER@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader,;t t
     497s,@MAKEINFO@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo,;t t
     498s,@AMTAR@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar,;t t
    499499s,@install_sh@,/home/bensch/svn/orxonox/branches/bensch/install-sh,;t t
    500500s,@STRIP@,,;t t

  • orxonox/branches/bensch/orxonox_gui.c

    r1813 r1816  
    3636     
    3737      {
    38         gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(hbox_video_audio), TRUE, TRUE, 0);       
     38        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(), TRUE, TRUE, 0);       
    3939       
    40         gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(hbox_video_audio), TRUE, TRUE, 0);       
     40        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(), TRUE, TRUE, 0);       
    4141      }
    4242      gtk_box_pack_start (GTK_BOX (vbox_main), hbox_video_audio, TRUE, TRUE, 0);
    … …  
    5050        */
    5151        {
    52           gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_exec_frame(hbox_video_audio), TRUE, TRUE, 0);       
     52          gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame(), TRUE, TRUE, 0);
    5353
    5454        }

  • orxonox/branches/bensch/orxonox_gui_audio.c

    r1813 r1816  
    11#include "orxonox_gui.h"
    22
    3 GtkWidget *orxonox_gui_audio_frame (GtkWidget *box )
     3GtkWidget *orxonox_gui_audio_frame (void)
    44{
    55  GtkWidget *frame;
    66  GtkWidget *button;
     7  GtkWidget *label;
     8  GtkWidget *music_volume_slider;
     9  GtkWidget *effects_volume_slider;
    710
    811  frame = gtk_frame_new ( "Audio-Options:");
    … …  
    1316
    1417        button = gtk_check_button_new_with_label ("Enable Sound");
    15         /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen);
     18        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
    1619         */
    1720        gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), button, TRUE, TRUE, 0);
     21
     22        label=gtk_label_new ("Music Volume");
     23        gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0);
     24        music_volume_slider = gtk_hscale_new_with_range (0,100,5);
     25        /* gtk_range_set_value ( GTK_RANGE (music_volume_slider), compress.video_filter_crop_slider[0]);*/
     26        gtk_range_set_update_policy ( GTK_RANGE (music_volume_slider), GTK_UPDATE_DISCONTINUOUS);
     27        /* g_signal_connect (GTK_RANGE (music_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/
     28        gtk_box_pack_start ( GTK_BOX (orxonox_gui_audio_vbox), music_volume_slider, TRUE, TRUE, 0);
     29
     30        label=gtk_label_new ("Effects Volume");
     31        gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0);
     32        effects_volume_slider = gtk_hscale_new_with_range (0,100,5);
     33        /* gtk_range_set_value ( GTK_RANGE (effects_volume_slider), compress.video_filter_crop_slider[0]);*/
     34        gtk_range_set_update_policy ( GTK_RANGE (effects_volume_slider), GTK_UPDATE_DISCONTINUOUS);
     35        /* g_signal_connect (GTK_RANGE (effects_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/
     36        gtk_box_pack_start ( GTK_BOX (orxonox_gui_audio_vbox), effects_volume_slider, TRUE, TRUE, 0);
     37
    1838    }
    1939    gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_audio_vbox);

  • orxonox/branches/bensch/orxonox_gui_audio.h

    r1809 r1816  
    22#define _ORXONOX_GUI_AUDIO_H
    33
    4 GtkWidget *orxonox_gui_audio_frame (GtkWidget *box );
     4GtkWidget *orxonox_gui_audio_frame (void);
    55
    66#endif /* _ORXONOX_GUI_AUDIO_H */

  • orxonox/branches/bensch/orxonox_gui_exec.c

    r1813 r1816  
    11#include "orxonox_gui.h"
    22
    3 GtkWidget *orxonox_gui_exec_frame (GtkWidget *box )
     3GtkWidget *orxonox_gui_exec_frame (void)
    44{
    55  GtkWidget *frame;
    6   GtkWidget *button;
     6  GtkWidget *save_button;
     7  GtkWidget *show_button;
     8  GtkWidget *start_button;
     9  GtkWidget *quit_button;
    710
    811  frame = gtk_frame_new ( "Execute-Tags:");
    … …  
    1215    {
    1316
    14         button = gtk_button_new_with_label ("Start");
     17        start_button = gtk_button_new_with_label ("Start");
    1518        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen);
    1619         */
    17         gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), button, TRUE, TRUE, 0);
     20        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), start_button, TRUE, TRUE, 5);
     21
     22        save_button = gtk_check_button_new_with_label ("Save Settings");
     23        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
     24         */
     25        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), save_button, TRUE, TRUE, 0);
     26
     27        show_button = gtk_check_button_new_with_label ("Always show this Menu");
     28        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
     29         */
     30        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), show_button, TRUE, TRUE, 0);
     31       
     32
     33        quit_button = gtk_button_new_with_label ("quit");
     34        g_signal_connect(GTK_BUTTON(quit_button), "clicked", G_CALLBACK(gtk_main_quit), NULL);
     35        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), quit_button, FALSE, FALSE, 5);
    1836    }
    1937    gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_exec_vbox);

  • orxonox/branches/bensch/orxonox_gui_exec.h

    r1812 r1816  
    22#define _ORXONOX_GUI_EXEC_H
    33
    4 GtkWidget *orxonox_gui_exec_frame (GtkWidget *box );
     4GtkWidget *orxonox_gui_exec_frame (void);
    55
    66#endif /* _ORXONOX_GUI_EXEC_H */

  • orxonox/branches/bensch/orxonox_gui_video.c

    r1813 r1816  
    11#include "orxonox_gui.h"
    22
    3 GtkWidget *orxonox_gui_video_frame (GtkWidget *box )
     3GtkWidget *orxonox_gui_video_frame (void)
    44{
    55  GtkWidget *frame;
    … …  
    1111    orxonox_gui_video_vbox = gtk_vbox_new (FALSE, 0);
    1212    {
    13 
    1413        button = gtk_check_button_new_with_label ("Fullscreen-mode");
    15         /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen);
     14        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_fullscreen);
    1615         */
    1716        gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0);
     17
     18        button = gtk_check_button_new_with_label ("Wireframe-mode");
     19        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_Wireframe);
     20         */
     21        gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0);
     22       
    1823    }
    1924    gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_video_vbox);

  • orxonox/branches/bensch/orxonox_gui_video.h

    r1809 r1816  
    22#define _ORXONOX_GUI_VIDEO_H
    33
    4 GtkWidget *orxonox_gui_video_frame (GtkWidget *box );
     4GtkWidget *orxonox_gui_video_frame (void);
    55
    66#endif /* _ORXONOX_GUI_VIDEO_H */
Note: See TracChangeset for help on using the changeset viewer.