Browse Source

Upgrade FLTK version

rdb 10 years ago
parent
commit
993894d93d
3 changed files with 8 additions and 8 deletions
  1. 4 4
      direct/src/plugin/p3dCert.cxx
  2. 2 2
      direct/src/plugin/p3dCert.h
  3. 2 2
      makepanda/makepanda.py

+ 4 - 4
direct/src/plugin/p3dCert.cxx

@@ -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_Button.H>
-#include <Fl/Fl_Return_Button.H>
-#include <Fl/Fl_Text_Display.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+#include <FL/Fl_Text_Display.H>
 
 
 #include <cassert>
 #include <cassert>
 #include <sys/types.h>
 #include <sys/types.h>

+ 2 - 2
direct/src/plugin/p3dCert.h

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

+ 2 - 2
makepanda/makepanda.py

@@ -749,8 +749,8 @@ if (COMPILER=="GCC"):
         SmartPkgEnable("PYTHON",    "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config", framework = "Python")
         SmartPkgEnable("PYTHON",    "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config", framework = "Python")
 
 
     if (RTDIST):
     if (RTDIST):
-        SmartPkgEnable("WX",    tool = "wx-config")
-        SmartPkgEnable("FLTK", "", ("fltk"), ("Fl/Fl.H"), tool = "fltk-config")
+        SmartPkgEnable("WX", tool = "wx-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