diff options
-rw-r--r-- | make/config/jogl/cg-common.cfg | 1 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg.h (renamed from make/stub_includes/cg/CG/cg.h) | 10 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cgGL.h (renamed from make/stub_includes/cg/CG/cgGL.h) | 2 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cgGL_profiles.h (renamed from make/stub_includes/cg/CG/cgGL_profiles.h) | 0 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg_bindlocations.h (renamed from make/stub_includes/cg/CG/cg_bindlocations.h) | 0 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg_datatypes.h (renamed from make/stub_includes/cg/CG/cg_datatypes.h) | 0 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg_enums.h (renamed from make/stub_includes/cg/CG/cg_enums.h) | 0 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg_errors.h (renamed from make/stub_includes/cg/CG/cg_errors.h) | 0 | ||||
-rw-r--r-- | make/stub_includes/cg/Cg/cg_profiles.h (renamed from make/stub_includes/cg/CG/cg_profiles.h) | 2 | ||||
-rw-r--r-- | make/stub_includes/opengl/cg.c | 2 |
10 files changed, 9 insertions, 8 deletions
diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg index 606f86b9d..f21ece3fd 100644 --- a/make/config/jogl/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg @@ -119,6 +119,7 @@ RuntimeExceptionType CgException # generated C code # +CustomCCode #include <gluegen_stdint.h> CustomCCode #include <stdio.h> /* android */ CustomCCode #include <stdlib.h> CustomCCode #include <Cg/cgGL.h> diff --git a/make/stub_includes/cg/CG/cg.h b/make/stub_includes/cg/Cg/cg.h index ef045defc..b40f0eeff 100644 --- a/make/stub_includes/cg/CG/cg.h +++ b/make/stub_includes/cg/Cg/cg.h @@ -117,7 +117,7 @@ typedef enum // # define CG_DATATYPE_MACRO(name, compiler_name, enum_name, base_name, ncols, nrows, pc) \ // enum_name , -#include <CG/cg_datatypes.h> +#include <Cg/cg_datatypes.h> } CGtype; @@ -127,7 +127,7 @@ typedef enum // enum_int,addressable,param_type) \ // enum_name = enum_int, -#include <CG/cg_bindlocations.h> +#include <Cg/cg_bindlocations.h> CG_UNDEFINED, @@ -141,7 +141,7 @@ typedef enum // # define CG_PROFILE_MACRO(name, compiler_id, compiler_id_caps, compiler_opt,int_id,vertex_profile) \ // CG_PROFILE_##compiler_id_caps = int_id, -#include <CG/cg_profiles.h> +#include <Cg/cg_profiles.h> CG_PROFILE_MAX = 7100, } CGprofile; @@ -150,7 +150,7 @@ typedef enum { // # define CG_ERROR_MACRO(code, enum_name, message) \ // enum_name = code, -# include <CG/cg_errors.h> +# include <Cg/cg_errors.h> } CGerror; typedef enum @@ -171,7 +171,7 @@ typedef enum { // # define CG_ENUM_MACRO(enum_name, enum_val) \ // enum_name = enum_val, -# include <CG/cg_enums.h> +# include <Cg/cg_enums.h> } CGenum; #include <stdarg.h> diff --git a/make/stub_includes/cg/CG/cgGL.h b/make/stub_includes/cg/Cg/cgGL.h index f66ec0685..d9595f382 100644 --- a/make/stub_includes/cg/CG/cgGL.h +++ b/make/stub_includes/cg/Cg/cgGL.h @@ -54,7 +54,7 @@ -#include <CG/cg.h> +#include <Cg/cg.h> /* Set up for either Win32 import/export/lib. */ #ifndef CGGLDLL_API diff --git a/make/stub_includes/cg/CG/cgGL_profiles.h b/make/stub_includes/cg/Cg/cgGL_profiles.h index 105748f1d..105748f1d 100644 --- a/make/stub_includes/cg/CG/cgGL_profiles.h +++ b/make/stub_includes/cg/Cg/cgGL_profiles.h diff --git a/make/stub_includes/cg/CG/cg_bindlocations.h b/make/stub_includes/cg/Cg/cg_bindlocations.h index 2bb714f26..2bb714f26 100644 --- a/make/stub_includes/cg/CG/cg_bindlocations.h +++ b/make/stub_includes/cg/Cg/cg_bindlocations.h diff --git a/make/stub_includes/cg/CG/cg_datatypes.h b/make/stub_includes/cg/Cg/cg_datatypes.h index 2eb0ff85a..2eb0ff85a 100644 --- a/make/stub_includes/cg/CG/cg_datatypes.h +++ b/make/stub_includes/cg/Cg/cg_datatypes.h diff --git a/make/stub_includes/cg/CG/cg_enums.h b/make/stub_includes/cg/Cg/cg_enums.h index cb7262feb..cb7262feb 100644 --- a/make/stub_includes/cg/CG/cg_enums.h +++ b/make/stub_includes/cg/Cg/cg_enums.h diff --git a/make/stub_includes/cg/CG/cg_errors.h b/make/stub_includes/cg/Cg/cg_errors.h index 25c120a5a..25c120a5a 100644 --- a/make/stub_includes/cg/CG/cg_errors.h +++ b/make/stub_includes/cg/Cg/cg_errors.h diff --git a/make/stub_includes/cg/CG/cg_profiles.h b/make/stub_includes/cg/Cg/cg_profiles.h index 8217a569a..3c3e68f59 100644 --- a/make/stub_includes/cg/CG/cg_profiles.h +++ b/make/stub_includes/cg/Cg/cg_profiles.h @@ -78,7 +78,7 @@ #define CG_IN_PROFILES_INCLUDE -#include <CG/cgGL_profiles.h> +#include <Cg/cgGL_profiles.h> /*CG_PROFILE_MACRO(DX9Vertex11,vs_1_1,*/CG_PROFILE_VS_1_1=/*,"vs_1_1",*/6153,//1) diff --git a/make/stub_includes/opengl/cg.c b/make/stub_includes/opengl/cg.c index 98c824285..688e80c82 100644 --- a/make/stub_includes/opengl/cg.c +++ b/make/stub_includes/opengl/cg.c @@ -21,6 +21,6 @@ typedef double GLdouble; /* double precision float */ typedef double GLclampd; /* double precision float in [0,1] */ #define CGDLL_API -#include <CG/cgGL.h> +#include <Cg/cgGL.h> |