summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouk Jansen <[email protected]>2005-04-18 13:05:24 +0000
committerJouk Jansen <[email protected]>2005-04-18 13:05:24 +0000
commit49b1d95c1cae4547199eeb7f7a045edb16611474 (patch)
treeb2d3972aa8f1d291191fb8d894637c4582320965
parente9a3d8a7726823efae8ed27f7f669e96a445950a (diff)
Updates for OpenVMS : New makefiles
added some type-casts Modified Files: Mesa/src/mesa/shader/descrip.mms Mesa/src/mesa/shader/program.c Mesa/src/mesa/shader/slang/slang_compile.c Mesa/src/mesa/shader/slang/slang_preprocess.c Added Files: Mesa/src/mesa/shader/slang/descrip.mms ----------------------------------------------------------------------
-rw-r--r--src/mesa/shader/descrip.mms9
-rw-r--r--src/mesa/shader/program.c2
-rw-r--r--src/mesa/shader/slang/descrip.mms41
-rw-r--r--src/mesa/shader/slang/slang_compile.c4
-rw-r--r--src/mesa/shader/slang/slang_preprocess.c4
5 files changed, 54 insertions, 6 deletions
diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
index ab0553fa53c..99fd4fc083a 100644
--- a/src/mesa/shader/descrip.mms
+++ b/src/mesa/shader/descrip.mms
@@ -1,6 +1,6 @@
# Makefile for core library for VMS
# contributed by Jouk Jansen [email protected]
-# Last revision : 23 March 2004
+# Last revision : 15 April 2005
.first
define gl [---.include.gl]
@@ -54,6 +54,12 @@ OBJECTS = \
VERSION=Mesa V3.4
##### TARGETS #####
+all :
+ $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
+ set def [.slang]
+ $(MMS)$(MMSQUALIFIERS)
+ set def [-]
+
# Make the library
$(LIBDIR)$(GL_LIB) : $(OBJECTS)
@ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
@@ -74,4 +80,5 @@ nvvertexec.obj : nvvertexec.c
nvvertparse.obj : nvvertparse.c
program.obj : program.c
shaderobjects.obj : shaderobjects.c
+ cc$(CFLAGS)/nowarn shaderobjects.c
shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index e406e1090c5..63d28083cc8 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -810,7 +810,7 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
modifier == STATE_MATRIX_INVTRANS) {
/* Be sure inverse is up to date:
*/
- _math_matrix_analyse( matrix );
+ _math_matrix_analyse( (GLmatrix*) matrix );
m = matrix->inv;
}
else {
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
new file mode 100644
index 00000000000..2ae622a7f0d
--- /dev/null
+++ b/src/mesa/shader/slang/descrip.mms
@@ -0,0 +1,41 @@
+# Makefile for core library for VMS
+# contributed by Jouk Jansen [email protected]
+# Last revision : 18 April 2005
+
+.first
+ define gl [----.include.gl]
+ define math [--.math]
+ define swrast [--.swrast]
+ define array_cache [--.array_cache]
+
+.include [----]mms-config.
+
+##### MACROS #####
+
+VPATH = RCS
+
+INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-]
+LIBDIR = [----.lib]
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+
+SOURCES = \
+ slang_compile.c,slang_preprocess.c
+
+OBJECTS = \
+ slang_compile.obj,slang_preprocess.obj
+
+##### RULES #####
+
+VERSION=Mesa V3.4
+
+##### TARGETS #####
+# Make the library
+$(LIBDIR)$(GL_LIB) : $(OBJECTS)
+ @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
+
+clean :
+ purge
+ delete *.obj;*
+
+slang_compile.obj : slang_compile.c
+slang_preprocess.obj : slang_preprocess.c
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 1fed790bdf7..5ecef00c1d0 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -1978,7 +1978,7 @@ static int compile_with_grammar (grammar id, const char *source, slang_translati
{
char buf[1024];
unsigned int pos;
- grammar_get_last_error (buf, 1024, &pos);
+ grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
slang_info_log_error (log, buf);
return 0;
}
@@ -2013,7 +2013,7 @@ int _slang_compile (const char *source, slang_translation_unit *unit, slang_unit
{
char buf[1024];
unsigned int pos;
- grammar_get_last_error (buf, 1024, &pos);
+ grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
slang_info_log_error (log, buf);
return 0;
}
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index b9c7a9efceb..7159db7e1e2 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -49,7 +49,7 @@ int _slang_preprocess_version (const char *text, unsigned int *version, unsigned
{
char buf[1024];
unsigned int pos;
- grammar_get_last_error (buf, 1024, &pos);
+ grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
slang_info_log_error (log, buf);
return 0;
}
@@ -58,7 +58,7 @@ int _slang_preprocess_version (const char *text, unsigned int *version, unsigned
{
char buf[1024];
unsigned int pos;
- grammar_get_last_error (buf, 1024, &pos);
+ grammar_get_last_error ( (unsigned char*) buf, 1024, (int*) &pos);
slang_info_log_error (log, buf);
grammar_destroy (id);
return 0;