Fix various build issues

This commit is contained in:
rdb
2015-02-11 14:16:21 +01:00
parent a6eb3fa442
commit 5a51a7e08d
5 changed files with 10 additions and 5 deletions

View File

@@ -4,12 +4,12 @@ compiler:
- clang
before_script:
- sudo apt-get install python-dev libpng-dev zlib1g-dev libssl-dev libx11-dev libgl1-mesa-dev libxrandr-dev libxxf86dga-dev libxcursor-dev bison flex libfreetype6-dev libvorbis-dev libjpeg-dev libopenal-dev libode-dev nvidia-cg-toolkit
script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT
script: python makepanda/makepanda.py --everything --git-commit $TRAVIS_COMMIT --installer
notifications:
irc:
channels:
- "chat.freenode.net#panda3d"
on_success: change
on_failure: change
on_failure: always
use_notice: true
skip_join: true

View File

@@ -27,10 +27,13 @@ TypeHandle Shader::_type_handle;
Shader::ShaderTable Shader::_load_table;
Shader::ShaderTable Shader::_make_table;
Shader::ShaderCaps Shader::_default_caps;
CGcontext Shader::_cg_context = 0;
int Shader::_shaders_generated;
ShaderUtilization Shader::_shader_utilization = SUT_unspecified;
#ifdef HAVE_CG
CGcontext Shader::_cg_context = 0;
#endif
////////////////////////////////////////////////////////////////////
// Function: Shader::cp_report_error
// Access: Public

View File

@@ -17,7 +17,7 @@
#ifdef HAVE_PYTHON
#ifndef CPPPARSER
extern EXPCL_PANDA_PUTIL Dtool_PyTypedObject Dtool_BamWriter;
extern Dtool_PyTypedObject Dtool_BamWriter;
#endif // CPPPARSER
////////////////////////////////////////////////////////////////////

View File

@@ -1,6 +1,8 @@
#ifndef _tgl_zgl_h_
#define _tgl_zgl_h_
#include "dtoolbase.h"
#include <stdlib.h>
#include <stdio.h>
#include <math.h>

View File

@@ -200,7 +200,7 @@ show_text(const string &prefix, int indent_width, string text) {
void ProgramBase::
write_man_page(ostream &out) {
string prog = _program_name.get_basename_wo_extension();
out << ".\\\" Automatically generated by " << prog << " -write-bam\n";
out << ".\\\" Automatically generated by " << prog << " -write-man\n";
// Format the man page title as the uppercase version of the program name,
// as per the UNIX manual conventions.