← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/GamePlayer/ghost/GPG_Application.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GamePlayer/ghost/GPG_Application.h
1
1
/**
2
 
 * $Id: GPG_Application.h 16558 2008-09-16 19:25:35Z blendix $
 
2
 * $Id: GPG_Application.h 19809 2009-04-20 09:13:59Z campbellbarton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
58
58
        GPG_Application(GHOST_ISystem* system);
59
59
        ~GPG_Application(void);
60
60
 
61
 
                        bool SetGameEngineData(struct Main* maggie, struct Scene* scene);
 
61
                        bool SetGameEngineData(struct Main* maggie, struct Scene* scene, int argc, char** argv);
62
62
                        bool startWindow(STR_String& title, int windowLeft, int windowTop, int windowWidth, int windowHeight,
63
63
                        const bool stereoVisual, const int stereoMode);
64
64
                        bool startFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode);
154
154
         */
155
155
        char* m_pyGlobalDictString;
156
156
        int m_pyGlobalDictString_Length;
 
157
        
 
158
        /* argc and argv need to be passed on to python */
 
159
        int             m_argc;
 
160
        char**  m_argv;
157
161
};
158
162