diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rw-r--r-- | make/cg-common.cfg | 2 | ||||
| -rw-r--r-- | make/jogl.properties | 2 | ||||
| -rw-r--r-- | make/stub_includes/cg/CG/cg.h | 10 | ||||
| -rw-r--r-- | make/stub_includes/cg/CG/cgGL.h | 4 | ||||
| -rw-r--r-- | make/stub_includes/cg/CG/cg_profiles.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/make/build.xml b/make/build.xml index f1352a2f2..c682e080a 100644 --- a/make/build.xml +++ b/make/build.xml @@ -314,7 +314,7 @@ <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> <!-- Cg declarations --> <property name="c.compiler.cg.outputfile.expr" value="${rootrel.obj.cg}/*.${c.compiler.obj.suffix}" /> - <property name="c.linker.cg.libs" value="-Wl,--kill-at -L"${windows.cg.lib}" -lopengl32 -lcg -lcgGL" /> + <property name="c.linker.cg.libs" value="-Wl,--kill-at -L"${windows.cg.lib}" -lopengl32 -lCg -lCgGL" /> <property name="rootrel.c.linker.cg.dso" value="${rootrel.obj}/jogl_cg.dll" /> <property name="c.linker.cg.dso" value="${project.root}/${rootrel.c.linker.cg.dso}" /> <property name="c.linker.cg.flags" value="-o ${c.linker.cg.dso}" /> @@ -360,7 +360,7 @@ <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> <!-- Cg declarations --> <property name="c.compiler.cg.outputfile.expr" value="${rootrel.obj.cg}/*.${c.compiler.obj.suffix}" /> - <property name="c.linker.cg.libs" value="-L"${x11.cg.lib}" -lcg -lcgGL -lGL" /> + <property name="c.linker.cg.libs" value="-L"${x11.cg.lib}" -lCg -lCgGL -lGL" /> <property name="rootrel.c.linker.cg.dso" value="${rootrel.obj}/libjogl_cg.so" /> <property name="c.linker.cg.dso" value="${project.root}/${rootrel.c.linker.cg.dso}" /> <property name="c.linker.cg.flags" value="-o ${c.linker.cg.dso}" /> @@ -425,7 +425,7 @@ <property name="c.linker.jogl.flags" value="-o ${c.linker.jogl.dso}" /> <!-- Cg declarations --> <property name="c.compiler.cg.outputfile.expr" value="${rootrel.obj.cg}/*.${c.compiler.obj.suffix}" /> - <property name="c.linker.cg.libs" value="-framework OpenGL -lcg -lcgGL" /> + <property name="c.linker.cg.libs" value="-framework OpenGL -lCg -lCgGL" /> <property name="rootrel.c.linker.cg.dso" value="${rootrel.obj}/libjogl_cg.jnilib" /> <property name="c.linker.cg.dso" value="${project.root}/${rootrel.c.linker.cg.dso}" /> <property name="c.linker.cg.flags" value="-o ${c.linker.cg.dso}" /> diff --git a/make/cg-common.cfg b/make/cg-common.cfg index f83ef37b8..9ef0071ff 100644 --- a/make/cg-common.cfg +++ b/make/cg-common.cfg @@ -57,7 +57,7 @@ RuntimeExceptionType CgException # CustomCCode #include <stdlib.h> -CustomCCode #include <CG/CgGL.h> +CustomCCode #include <Cg/cgGL.h> ArgumentIsString fooString 0 ArgumentIsString fooString1 0 diff --git a/make/jogl.properties b/make/jogl.properties index ce7f4be13..bd081e484 100644 --- a/make/jogl.properties +++ b/make/jogl.properties @@ -52,5 +52,5 @@ vc7.root=C:/Program Files/Microsoft Visual Studio .NET/Vc7 # absolute path of the lib directory # windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib -x11.cg.lib=FIXME: install Cg toolkit and enter default path +x11.cg.lib=/usr/lib macosx.cg.lib=FIXME: install Cg toolkit and enter default path diff --git a/make/stub_includes/cg/CG/cg.h b/make/stub_includes/cg/CG/cg.h index afed92990..1dd2fb353 100644 --- a/make/stub_includes/cg/CG/cg.h +++ b/make/stub_includes/cg/CG/cg.h @@ -109,7 +109,7 @@ typedef enum CG_TYPE_START_ENUM = 1024, //# define CG_DATATYPE_MACRO(name, compiler_name, enum_name, ncols, nrows) enum_name , -#include <Cg/cg_datatypes.h> +#include <CG/cg_datatypes.h> } CGtype; @@ -117,7 +117,7 @@ typedef enum { //# define CG_BINDLOCATION_MACRO(name,enum_name,compiler_name,enum_int,addressable,param_type) enum_name = enum_int, -#include <Cg/cg_bindlocations.h> +#include <CG/cg_bindlocations.h> CG_UNDEFINED, @@ -130,7 +130,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, } CGprofile; @@ -138,7 +138,7 @@ typedef enum typedef enum { //# define CG_ERROR_MACRO(code, enum_name, new_enum_name, message) new_enum_name = code, -# include <Cg/cg_errors.h> +# include <CG/cg_errors.h> } CGerror; typedef enum @@ -275,7 +275,7 @@ CGDLL_API CGerrorCallbackFunc cgGetErrorCallback(void); #define cgGetLastListing cgGL_DEPRECATEDAPI_GetLastListing #define cgGetProgramProfile cgGL_DEPRECATEDAPI_ProgramProfile -# include <Cg/cg_deprecated_api.h> +# include <CG/cg_deprecated_api.h> #endif diff --git a/make/stub_includes/cg/CG/cgGL.h b/make/stub_includes/cg/CG/cgGL.h index 80bf28202..1af5ced5b 100644 --- a/make/stub_includes/cg/CG/cgGL.h +++ b/make/stub_includes/cg/CG/cgGL.h @@ -55,7 +55,7 @@ #ifndef CG_DEPRECATED_API -#include <Cg/cg.h> +#include <CG/cg.h> /* Set up for either Win32 import/export/lib. */ #ifndef CGGLDLL_API @@ -371,7 +371,7 @@ CGGLDLL_API GLenum cgGLGetTextureEnum(/*CGparameter*/CGparameter* param); #define cgGLEnableClientState cgGL_DEPRECATEDAPI_EnableClientState #define cgGLDisableClientState cgGL_DEPRECATEDAPI_DisableClientState -#include <Cg/cgGL_deprecated_api.h> +#include <CG/cgGL_deprecated_api.h> #endif diff --git a/make/stub_includes/cg/CG/cg_profiles.h b/make/stub_includes/cg/CG/cg_profiles.h index 38b171915..c77f45229 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) |