From 24fcece997ba911b0270033a357bbd83258d4f1a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 16 Mar 2009 14:38:27 +0000 Subject: JOGL refactoring: Refactored JOGL into 3 independent components. 1 NWI - Native windowing interface Abstracts the the general NativeWindow interface and it's factory, incl the basic JAWT and Xlib toolkit. The latter was motivated to clean up the JOGL workspace, and to allow other to reuse this part. The generic core is nwi.core.jar, the AWT add-on is nwi.awt.jar. 2 JOGL - The OpenGL mapping Further cleanup of the SPEC. All non OpenGL toolkits are relocated to NWI and NEWT. There is still openmax and the windows audio layer .. Another cleanup of the fixed function pipeline emulation. Moved utilities and implementations where they belong .. Removed GLUnsupportedException. Misc .. changes 3 NEWT - The new windowing toolkit The generic NEWT, newt.core.jar. The JOGL and AWT modules are seperate, newt.ogl.jar newt.awt.jar. Their build can be switched off. The modules source and builds resides in their own directory. Because of their nature, they share the stub_includes, etc. Each module has it's own ant build script - build-nwi.xml - build-jogl.xml - build-newt.xml They can be build at once using build.xml as ususal, which just invokes the seperate build tasks. if rootrel.build=build, then the build location is jogl/build-nwi jogl/build-jogl jogl/build-newt and the sources are under jogl/src/nwi jogl/src/jogl jogl/src/newt Tested: jogl-demos, d4; Linux, MacOsX; Nvidia git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1868 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/config/intptr.cfg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 make/config/intptr.cfg (limited to 'make/config/intptr.cfg') diff --git a/make/config/intptr.cfg b/make/config/intptr.cfg new file mode 100755 index 000000000..c946e4851 --- /dev/null +++ b/make/config/intptr.cfg @@ -0,0 +1,17 @@ +CustomCCode #ifdef _WIN32 +CustomCCode #ifdef _MSC_VER +CustomCCode /* This typedef is apparently needed for Microsoft compilers before VC8, +CustomCCode and on Windows CE */ +CustomCCode #if (_MSC_VER < 1400) || defined(UNDER_CE) +CustomCCode #ifdef _WIN64 +CustomCCode typedef long long intptr_t; +CustomCCode #else +CustomCCode typedef int intptr_t; +CustomCCode #endif +CustomCCode #endif +CustomCCode #else +CustomCCode #include +CustomCCode #endif +CustomCCode #else +CustomCCode #include +CustomCCode #endif -- cgit v1.2.3