TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade FLTK version

Browse Source
This commit is contained in:
rdb 2015-03-27 23:23:26 +01:00
parent 477aa4bdfe
commit 993894d93d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/plugin/p3dCert.cxx
View File

@ -16,10 +16,10 @@
#include "wstring_encode.h" #include "wstring_encode.h"
#include "mkdir_complete.h" #include "mkdir_complete.h"
#include <Fl/Fl_Box.H> #include <FL/Fl_Box.H>
#include <Fl/Fl_Button.H> #include <FL/Fl_Button.H>
#include <Fl/Fl_Return_Button.H> #include <FL/Fl_Return_Button.H>
#include <Fl/Fl_Text_Display.H> #include <FL/Fl_Text_Display.H>
#include <cassert> #include <cassert>
#include <sys/types.h> #include <sys/types.h>

4
direct/src/plugin/p3dCert.h
View File

@ -15,8 +15,8 @@
#ifndef P3DCERT_H #ifndef P3DCERT_H
#define P3DCERT_H #define P3DCERT_H
#include <Fl/Fl.H> #include <FL/Fl.H>
#include <Fl/Fl_Window.H> #include <FL/Fl_Window.H>
#define OPENSSL_NO_KRB5 #define OPENSSL_NO_KRB5
#include "openssl/x509.h" #include "openssl/x509.h"

2
makepanda/makepanda.py
View File

@ -750,7 +750,7 @@ if (COMPILER=="GCC"):
if (RTDIST): if (RTDIST):
SmartPkgEnable("WX", tool = "wx-config") SmartPkgEnable("WX", tool = "wx-config")
SmartPkgEnable("FLTK", "", ("fltk"), ("Fl/Fl.H"), tool = "fltk-config") SmartPkgEnable("FLTK", "", ("fltk"), ("FL/Fl.H"), tool = "fltk-config")
if GetTarget() != 'darwin': if GetTarget() != 'darwin':
# CgGL is covered by the Cg framework, and we don't need X11 components on OSX # CgGL is covered by the Cg framework, and we don't need X11 components on OSX