[svn:parrot] r43840 - in branches/opengl_dynamic_nci: config/gen config/gen/makefiles tools/build
plobsing at svn.parrot.org
plobsing at svn.parrot.org
Wed Feb 10 01:06:37 UTC 2010
Author: plobsing
Date: Wed Feb 10 01:06:36 2010
New Revision: 43840
URL: https://trac.parrot.org/parrot/changeset/43840
Log:
build parrot without opengl signatures and add opengl thunks to build of runtime/parrot/dynext/libglutcb.so
Modified:
branches/opengl_dynamic_nci/config/gen/makefiles/root.in
branches/opengl_dynamic_nci/config/gen/opengl.pm
branches/opengl_dynamic_nci/tools/build/nativecall.pir
Modified: branches/opengl_dynamic_nci/config/gen/makefiles/root.in
==============================================================================
--- branches/opengl_dynamic_nci/config/gen/makefiles/root.in Wed Feb 10 01:02:45 2010 (r43839)
+++ branches/opengl_dynamic_nci/config/gen/makefiles/root.in Wed Feb 10 01:06:36 2010 (r43840)
@@ -2399,7 +2399,15 @@
# for use by runtime/parrot/library/OpenGL.pir
src/glut_callbacks$(O): $(GENERAL_H_FILES)
-$(LIBGLUTCB_SO): $(LIBPARROT) src/glut_callbacks$(O)
+src/glut_nci_thunks.c: $(PARROT) runtime/parrot/library/data_json.pbc tools/build/nativecall.pir
+ $(PARROT) tools/build/nativecall.pir \
+ --loader-name=Parrot_glut_nci_loader \
+ <src/glut_nci_thunks.nci \
+ >src/glut_nci_thunks.c
+
+src/glut_nci_thunks$(O): $(GENERAL_H_FILES)
+
+$(LIBGLUTCB_SO): $(LIBPARROT) src/glut_callbacks$(O) src/glut_nci_thunks$(O)
$(LD) $(LD_LOAD_FLAGS) $(LDFLAGS) \
@ld_out@$@ src/glut_callbacks$(O) \
$(ALL_PARROT_LIBS) @opengl_lib@
Modified: branches/opengl_dynamic_nci/config/gen/opengl.pm
==============================================================================
--- branches/opengl_dynamic_nci/config/gen/opengl.pm Wed Feb 10 01:02:45 2010 (r43839)
+++ branches/opengl_dynamic_nci/config/gen/opengl.pm Wed Feb 10 01:06:36 2010 (r43840)
@@ -15,7 +15,7 @@
=item F<runtime/parrot/library/OpenGL_funcs.pir>
-=item F<config/gen/call_list/opengl.in>
+=item F<src/glut_nci_thunks.nci>
=item F<src/glut_callbacks.c>
@@ -436,7 +436,7 @@
my $MACRO_FILE = 'runtime/parrot/include/opengl_defines.pasm';
my $FUNCS_FILE = 'runtime/parrot/library/OpenGL_funcs.pir';
-my $SIGS_FILE = 'config/gen/call_list/opengl.in';
+my $SIGS_FILE = 'src/glut_nci_thunks.nci';
my $C_FILE = 'src/glut_callbacks.c';
Modified: branches/opengl_dynamic_nci/tools/build/nativecall.pir
==============================================================================
--- branches/opengl_dynamic_nci/tools/build/nativecall.pir Wed Feb 10 01:02:45 2010 (r43839)
+++ branches/opengl_dynamic_nci/tools/build/nativecall.pir Wed Feb 10 01:06:36 2010 (r43840)
@@ -242,13 +242,10 @@
* Notes:
* References:
*/
+
+#define PARROT_IN_EXTENSION
#include "parrot/parrot.h"
-#include "parrot/hash.h"
-#include "parrot/oplib/ops.h"
-#include "pmc/pmc_managedstruct.h"
#include "pmc/pmc_nci.h"
-#include "pmc/pmc_pointer.h"
-#include "pmc/pmc_callcontext.h"
#ifdef PARROT_IN_CORE
/* external libraries don't have to care about string subsystem */
@@ -258,15 +255,6 @@
/* HEADERIZER HFILE: none */
/* HEADERIZER STOP */
-/*
- * if the architecture can build some or all of these signatures
- * enable the define below
- * - the JITed function will be called first
- * - if it returns NULL, the hardcoded version will do the job
- */
-
-#include "frame_builder.h"
-
/* All our static functions that call in various ways. Yes, terribly
hackish, but that is just fine */
More information about the parrot-commits
mailing list