diff options
219 files changed, 2963 insertions, 20564 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index acc13fb0e33..3eed1ef54d2 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,25 +24,30 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(audaspace) -ADD_SUBDIRECTORY(string) -ADD_SUBDIRECTORY(ghost) -ADD_SUBDIRECTORY(guardedalloc) -ADD_SUBDIRECTORY(moto) -ADD_SUBDIRECTORY(container) -ADD_SUBDIRECTORY(memutil) -ADD_SUBDIRECTORY(decimation) -ADD_SUBDIRECTORY(iksolver) -ADD_SUBDIRECTORY(boolop) -ADD_SUBDIRECTORY(opennl) -ADD_SUBDIRECTORY(smoke) +add_subdirectory(audaspace) +add_subdirectory(string) +add_subdirectory(ghost) +add_subdirectory(guardedalloc) +add_subdirectory(moto) +add_subdirectory(memutil) +add_subdirectory(iksolver) +add_subdirectory(opennl) +add_subdirectory(smoke) -IF(WITH_FLUID) - ADD_SUBDIRECTORY(elbeem) -ENDIF(WITH_FLUID) +if(WITH_MOD_FLUID) + add_subdirectory(elbeem) +endif() -IF(WITH_IK_ITASC) - ADD_SUBDIRECTORY(itasc) -ENDIF(WITH_IK_ITASC) +if(WITH_MOD_DECIMATE) + add_subdirectory(container) + add_subdirectory(decimation) +endif() -ADD_SUBDIRECTORY(bsp) +if(WITH_MOD_BOOLEAN) + add_subdirectory(boolop) + add_subdirectory(bsp) +endif() + +if(WITH_IK_ITASC) + add_subdirectory(itasc) +endif() diff --git a/intern/Makefile b/intern/Makefile deleted file mode 100644 index ed0b0cfff28..00000000000 --- a/intern/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Bounces make to subdirectories. Also installs after succesful all target. - -SOURCEDIR = intern - -# include nan_subdirs.mk - -ALLDIRS = string ghost guardedalloc moto container memutil -ALLDIRS += decimation iksolver itasc bsp opennl elbeem boolop smoke audaspace - -all:: - @for i in $(ALLDIRS); do \ - echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\ - $(MAKE) -C $$i install || exit 1; \ - done -clean test debug:: - @for i in $(ALLDIRS); do \ - echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\ - $(MAKE) -C $$i $@ || exit 1; \ - done - diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 6982bd83276..74f483eab05 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -20,7 +20,7 @@ # # ***** END LGPL LICENSE BLOCK ***** -SET(INC +set(INC . intern FX SRC @@ -28,56 +28,228 @@ SET(INC ${LIBSAMPLERATE_INC} ) -FILE(GLOB SRC - intern/*.cpp - intern/*.h - FX/*.cpp - SRC/*.cpp +set(SRC + FX/AUD_AccumulatorFactory.cpp + FX/AUD_BaseIIRFilterReader.cpp + FX/AUD_ButterworthFactory.cpp + FX/AUD_CallbackIIRFilterReader.cpp + FX/AUD_DelayFactory.cpp + FX/AUD_DelayReader.cpp + FX/AUD_DoubleFactory.cpp + FX/AUD_DoubleReader.cpp + FX/AUD_EffectFactory.cpp + FX/AUD_EffectReader.cpp + FX/AUD_EnvelopeFactory.cpp + FX/AUD_FaderFactory.cpp + FX/AUD_FaderReader.cpp + FX/AUD_HighpassFactory.cpp + FX/AUD_IIRFilterFactory.cpp + FX/AUD_IIRFilterReader.cpp + FX/AUD_LimiterFactory.cpp + FX/AUD_LimiterReader.cpp + FX/AUD_LoopFactory.cpp + FX/AUD_LoopReader.cpp + FX/AUD_LowpassFactory.cpp + FX/AUD_PingPongFactory.cpp + FX/AUD_PitchFactory.cpp + FX/AUD_PitchReader.cpp + FX/AUD_RectifyFactory.cpp + FX/AUD_ReverseFactory.cpp + FX/AUD_ReverseReader.cpp + FX/AUD_SquareFactory.cpp + FX/AUD_SumFactory.cpp + FX/AUD_SuperposeFactory.cpp + FX/AUD_SuperposeReader.cpp + FX/AUD_VolumeFactory.cpp + intern/AUD_3DMath.h + intern/AUD_Buffer.cpp + intern/AUD_Buffer.h + intern/AUD_BufferReader.cpp + intern/AUD_BufferReader.h + intern/AUD_C-API.cpp + intern/AUD_C-API.h + intern/AUD_ChannelMapperFactory.cpp + intern/AUD_ChannelMapperFactory.h + intern/AUD_ChannelMapperReader.cpp + intern/AUD_ChannelMapperReader.h + intern/AUD_ConverterFactory.cpp + intern/AUD_ConverterFactory.h + intern/AUD_ConverterFunctions.cpp + intern/AUD_ConverterFunctions.h + intern/AUD_ConverterReader.cpp + intern/AUD_ConverterReader.h + intern/AUD_DefaultMixer.cpp + intern/AUD_DefaultMixer.h + intern/AUD_FileFactory.cpp + intern/AUD_FileFactory.h + intern/AUD_I3DDevice.h + intern/AUD_IDevice.h + intern/AUD_IFactory.h + intern/AUD_IReader.h + intern/AUD_LinearResampleFactory.cpp + intern/AUD_LinearResampleFactory.h + intern/AUD_LinearResampleReader.cpp + intern/AUD_LinearResampleReader.h + intern/AUD_Mixer.cpp + intern/AUD_Mixer.h + intern/AUD_MixerFactory.cpp + intern/AUD_MixerFactory.h + intern/AUD_NULLDevice.cpp + intern/AUD_NULLDevice.h + intern/AUD_PyInit.h + intern/AUD_ReadDevice.cpp + intern/AUD_ReadDevice.h + intern/AUD_Reference.h + intern/AUD_ResampleFactory.h + intern/AUD_SequencerFactory.cpp + intern/AUD_SequencerFactory.h + intern/AUD_SequencerReader.cpp + intern/AUD_SequencerReader.h + intern/AUD_SilenceFactory.cpp + intern/AUD_SilenceFactory.h + intern/AUD_SilenceReader.cpp + intern/AUD_SilenceReader.h + intern/AUD_SinusFactory.cpp + intern/AUD_SinusFactory.h + intern/AUD_SinusReader.cpp + intern/AUD_SinusReader.h + intern/AUD_SoftwareDevice.cpp + intern/AUD_SoftwareDevice.h + intern/AUD_Space.h + intern/AUD_StreamBufferFactory.cpp + intern/AUD_StreamBufferFactory.h + + FX/AUD_AccumulatorFactory.h + FX/AUD_BaseIIRFilterReader.h + FX/AUD_ButterworthFactory.h + FX/AUD_CallbackIIRFilterReader.h + FX/AUD_DelayFactory.h + FX/AUD_DelayReader.h + FX/AUD_DoubleFactory.h + FX/AUD_DoubleReader.h + FX/AUD_EffectFactory.h + FX/AUD_EffectReader.h + FX/AUD_EnvelopeFactory.h + FX/AUD_FaderFactory.h + FX/AUD_FaderReader.h + FX/AUD_HighpassFactory.h + FX/AUD_IIRFilterFactory.h + FX/AUD_IIRFilterReader.h + FX/AUD_LimiterFactory.h + FX/AUD_LimiterReader.h + FX/AUD_LoopFactory.h + FX/AUD_LoopReader.h + FX/AUD_LowpassFactory.h + FX/AUD_PingPongFactory.h + FX/AUD_PitchFactory.h + FX/AUD_PitchReader.h + FX/AUD_RectifyFactory.h + FX/AUD_ReverseFactory.h + FX/AUD_ReverseReader.h + FX/AUD_SquareFactory.h + FX/AUD_SumFactory.h + FX/AUD_SuperposeFactory.h + FX/AUD_SuperposeReader.h + FX/AUD_VolumeFactory.h +) + +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) + list(APPEND INC ffmpeg ${FFMPEG_INC}) + set(FFMPEGSRC + ffmpeg/AUD_FFMPEGFactory.cpp + ffmpeg/AUD_FFMPEGReader.cpp + + ffmpeg/AUD_FFMPEGFactory.h + ffmpeg/AUD_FFMPEGReader.h + ) +endif() + +if(WITH_SDL) + add_definitions(-DWITH_SDL) + list(APPEND INC SDL ${SDL_INCLUDE_DIR}) + set(SDLSRC + SDL/AUD_SDLDevice.cpp + + SDL/AUD_SDLDevice.h + ) +endif() + +if(WITH_OPENAL) + add_definitions(-DWITH_OPENAL) + list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) + set(OPENALSRC + OpenAL/AUD_OpenALDevice.cpp + + OpenAL/AUD_OpenALDevice.h + ) +endif() + +if(WITH_JACK) + add_definitions(-DWITH_JACK) + list(APPEND INC jack ${JACK_INC}) + set(JACKSRC + jack/AUD_JackDevice.cpp + + jack/AUD_JackDevice.h + ) +endif() + +if(WITH_CODEC_SNDFILE) + add_definitions(-DWITH_SNDFILE) + list(APPEND INC sndfile ${SNDFILE_INC}) + set(SNDFILESRC + sndfile/AUD_SndFileFactory.cpp + sndfile/AUD_SndFileReader.cpp + + sndfile/AUD_SndFileFactory.h + sndfile/AUD_SndFileReader.h + ) +endif() + +if(WITH_SAMPLERATE) + add_definitions(-DWITH_SAMPLERATE) + set(SRCFILESRC + SRC/AUD_SRCResampleFactory.cpp + SRC/AUD_SRCResampleReader.cpp + + SRC/AUD_SRCResampleFactory.h + SRC/AUD_SRCResampleReader.h + ) +endif() + +if(WITH_FFTW3 AND FALSE) + add_definitions(-DWITH_FFTW3) + list(APPEND INC fftw ${FFTW3_INC}) + set(FFTW3SRC + fftw/AUD_BandPassFactory.cpp + fftw/AUD_BandPassReader.cpp + + fftw/AUD_BandPassFactory.h + fftw/AUD_BandPassReader.h + ) +endif() + +if(WITH_PYTHON) + list(APPEND INC Python ${PYTHON_INCLUDE_DIRS}) + set(PYTHONSRC + Python/AUD_PyAPI.cpp + + Python/AUD_PyAPI.h + ) + add_definitions(-DWITH_PYTHON) +endif() + +set(SRC + ${SRC} + ${FFMPEGSRC} + ${SNDFILESRC} + ${SRCFILESRC} + ${FFTW3SRC} + ${SDLSRC} + ${OPENALSRC} + ${JACKSRC} + ${PYTHONSRC} ) -IF(WITH_FFMPEG) - LIST(APPEND INC ffmpeg ${FFMPEG_INC}) - FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) - -IF(WITH_SDL) - LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) - FILE(GLOB SDLSRC SDL/*.cpp) - ADD_DEFINITIONS(-DWITH_SDL) -ENDIF(WITH_SDL) - -IF(WITH_OPENAL) - LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - FILE(GLOB OPENALSRC OpenAL/*.cpp) - ADD_DEFINITIONS(-DWITH_OPENAL) -ENDIF(WITH_OPENAL) - -IF(WITH_JACK) - LIST(APPEND INC jack ${JACK_INC}) - FILE(GLOB JACKSRC jack/*.cpp) - ADD_DEFINITIONS(-DWITH_JACK) -ENDIF(WITH_JACK) - -IF(WITH_SNDFILE) - LIST(APPEND INC sndfile ${SNDFILE_INC}) - FILE(GLOB SNDFILESRC sndfile/*.cpp) - ADD_DEFINITIONS(-DWITH_SNDFILE) -ENDIF(WITH_SNDFILE) - -#IF(WITH_FFTW3) -# LIST(APPEND INC fftw ${FFTW3_INC}) -# FILE(GLOB FFTW3SRC fftw/*.cpp) -# ADD_DEFINITIONS(-DWITH_FFTW3) -#ENDIF(WITH_FFTW3) - -IF(WITH_PYTHON) - LIST(APPEND INC Python ${PYTHON_INC}) - FILE(GLOB PYTHONSRC Python/*.cpp) -ELSE(WITH_PYTHON) - ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(WITH_PYTHON) - -SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC}) - -BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}") +blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}") diff --git a/intern/audaspace/FX/Makefile b/intern/audaspace/FX/Makefile deleted file mode 100644 index bda0e2bdab6..00000000000 --- a/intern/audaspace/FX/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_fx -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I../ffmpeg -CPPFLAGS += -I../intern -CPPFLAGS += -I../SDL -CPPFLAGS += -I../SRC -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile deleted file mode 100644 index c1a613af1ae..00000000000 --- a/intern/audaspace/Makefile +++ /dev/null @@ -1,119 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): GSR -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -include nan_definitions.mk - -LIBNAME = audaspace -SOURCEDIR = intern/audaspace -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -DIRS += FX -DIRS += SDL -DIRS += SRC -DIRS += Python - -ifeq ($(WITH_FFMPEG),true) - DIRS += ffmpeg -endif - -ifeq ($(WITH_OPENAL),true) - DIRS += OpenAL -endif - -ifeq ($(WITH_JACK),true) - DIRS += jack -endif - -ifeq ($(WITH_SNDFILE),true) - DIRS += sndfile -endif - -#ifeq ($(WITH_FFTW3),true) -# DIRS += fftw -#endif - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE) - @[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include - @[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_python.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) - -ifeq ($(WITH_FFMPEG),true) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_ffmpeg.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -endif - -ifeq ($(WITH_OPENAL),true) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_openal.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -endif - -ifeq ($(WITH_JACK),true) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_jack.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -endif - -ifeq ($(WITH_SNDFILE),true) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -endif - -#ifeq ($(WITH_FFTW3),true) -# @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -#endif - -ifeq ($(OS),darwin) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a - -ifeq ($(WITH_FFMPEG),true) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a -endif - -ifeq ($(WITH_OPENAL),true) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a -endif - -ifeq ($(WITH_JACK),true) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a -endif - -ifeq ($(WITH_SNDFILE),true) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a -endif - -#ifeq ($(WITH_FFTW3),true) -# ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a -#endif - -endif - @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp index a87a4ad5eef..6a9f2c40d92 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp @@ -128,16 +128,21 @@ void AUD_OpenALDevice::updateStreams() ALint info; AUD_DeviceSpecs specs = m_specs; + ALCenum cerr; + std::list<AUD_OpenALHandle*> stopSounds; + std::list<AUD_OpenALHandle*> pauseSounds; + AUD_HandleIterator it; while(1) { lock(); alcSuspendContext(m_context); - + cerr = alcGetError(m_device); + if(cerr == ALC_NO_ERROR) { // for all sounds - for(AUD_HandleIterator it = m_playingSounds->begin(); it != m_playingSounds->end(); it++) + for(it = m_playingSounds->begin(); it != m_playingSounds->end(); it++) { sound = *it; @@ -232,33 +237,33 @@ void AUD_OpenALDevice::updateStreams() if(sound->stop) sound->stop(sound->stop_data); - // increment the iterator to the next value, - // because the sound gets deleted in the list here. - ++it; // pause or if(sound->keep) - pause(sound); + pauseSounds.push_back(sound); // stop else - stop(sound); - // decrement again, so that we get the next sound in the - // next loop run - if(m_playingSounds->empty()) - break; - else - --it; + stopSounds.push_back(sound); } // continue playing else alSourcePlay(sound->source); } } - } - alcProcessContext(m_context); + for(it = pauseSounds.begin(); it != pauseSounds.end(); it++) + pause(*it); + + for(it = stopSounds.begin(); it != stopSounds.end(); it++) + stop(*it); + + pauseSounds.clear(); + stopSounds.clear(); + + alcProcessContext(m_context); + } // stop thread - if(m_playingSounds->empty()) + if(m_playingSounds->empty() || (cerr != ALC_NO_ERROR)) { unlock(); m_playing = false; @@ -338,6 +343,7 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize) m_useMC = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE; alGetError(); + alcGetError(m_device); m_specs = specs; m_buffersize = buffersize; diff --git a/intern/audaspace/OpenAL/Makefile b/intern/audaspace/OpenAL/Makefile deleted file mode 100644 index 4cf9f66b06c..00000000000 --- a/intern/audaspace/OpenAL/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_openal -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I../intern -CPPFLAGS += -I. diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp index b0c55d5856e..9620f26cc33 100644 --- a/intern/audaspace/Python/AUD_PyAPI.cpp +++ b/intern/audaspace/Python/AUD_PyAPI.cpp @@ -851,7 +851,7 @@ Factory_filter(Factory* self, PyObject* args) return NULL; } - if(!PySequence_Length(py_b) || (py_a != NULL && !PySequence_Length(py_a))) + if(!PySequence_Size(py_b) || (py_a != NULL && !PySequence_Size(py_a))) { PyErr_SetString(PyExc_ValueError, "The sequence has to contain at least one value!"); return NULL; @@ -862,7 +862,7 @@ Factory_filter(Factory* self, PyObject* args) float value; int result; - for(int i = 0; i < PySequence_Length(py_b); i++) + for(int i = 0; i < PySequence_Size(py_b); i++) { py_value = PySequence_GetItem(py_b, i); result = PyArg_Parse(py_value, "f:filter", &value); @@ -876,7 +876,7 @@ Factory_filter(Factory* self, PyObject* args) if(py_a) { - for(int i = 0; i < PySequence_Length(py_a); i++) + for(int i = 0; i < PySequence_Size(py_a); i++) { py_value = PySequence_GetItem(py_a, i); result = PyArg_Parse(py_value, "f:filter", &value); @@ -1044,18 +1044,13 @@ Handle_pause(Handle *self) try { - if(device->device->pause(self->handle)) - { - Py_RETURN_TRUE; - } + return PyBool_FromLong((long)device->device->pause(self->handle)); } catch(AUD_Exception& e) { PyErr_SetString(AUDError, e.str); return NULL; } - - Py_RETURN_FALSE; } PyDoc_STRVAR(M_aud_Handle_resume_doc, @@ -1071,18 +1066,13 @@ Handle_resume(Handle *self) try { - if(device->device->resume(self->handle)) - { - Py_RETURN_TRUE; - } + return PyBool_FromLong((long)device->device->resume(self->handle)); } catch(AUD_Exception& e) { PyErr_SetString(AUDError, e.str); return NULL; } - - Py_RETURN_FALSE; } PyDoc_STRVAR(M_aud_Handle_stop_doc, @@ -1099,18 +1089,13 @@ Handle_stop(Handle *self) try { - if(device->device->stop(self->handle)) - { - Py_RETURN_TRUE; - } + return PyBool_FromLong((long)device->device->stop(self->handle)); } catch(AUD_Exception& e) { PyErr_SetString(AUDError, e.str); return NULL; } - - Py_RETURN_FALSE; } static PyMethodDef Handle_methods[] = { @@ -1185,14 +1170,7 @@ Handle_get_keep(Handle *self, void* nothing) try { - if(device->device->getKeep(self->handle)) - { - Py_RETURN_TRUE; - } - else - { - Py_RETURN_FALSE; - } + return PyBool_FromLong((long)device->device->getKeep(self->handle)); } catch(AUD_Exception& e) { @@ -1237,7 +1215,7 @@ Handle_get_status(Handle *self, void* nothing) try { - return Py_BuildValue("i", device->device->getStatus(self->handle)); + return PyBool_FromLong((long)device->device->getStatus(self->handle)); } catch(AUD_Exception& e) { @@ -1568,14 +1546,7 @@ Handle_get_relative(Handle *self, void* nothing) AUD_I3DDevice* device = dynamic_cast<AUD_I3DDevice*>(dev->device); if(device) { - if(device->isRelative(self->handle)) - { - Py_RETURN_TRUE; - } - else - { - Py_RETURN_FALSE; - } + return PyBool_FromLong((long)device->isRelative(self->handle)); } else { diff --git a/intern/audaspace/Python/Makefile b/intern/audaspace/Python/Makefile deleted file mode 100644 index a66f86549f5..00000000000 --- a/intern/audaspace/Python/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2010 by Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Ton -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_python -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) - -ifeq ($(WITH_SDL),true) - CPPFLAGS += -DWITH_SDL - CPPFLAGS += $(NAN_SDLCFLAGS) -endif - -ifeq ($(WITH_OPENAL),true) - CPPFLAGS += -DWITH_OPENAL - CPPFLAGS += -I../OpenAL -endif - -ifeq ($(WITH_JACK),true) - CPPFLAGS += -DWITH_JACK - CPPFLAGS += $(NAN_JACKCFLAGS) - CPPFLAGS += -I../jack -endif - -ifeq ($(WITH_FFMPEG),true) - CPPFLAGS += -DWITH_FFMPEG - CPPFLAGS += $(NAN_FFMPEGCFLAGS) -endif - -ifeq ($(WITH_SNDFILE),true) - CPPFLAGS += -DWITH_SNDFILE - CPPFLAGS += -I../sndfile - CPPFLAGS += -I$(NAN_SNDFILE)/include -endif - -CPPFLAGS += -I$(NAN_SAMPLERATE)/include/ -CPPFLAGS += -I../ffmpeg -CPPFLAGS += -I../FX -CPPFLAGS += -I../SDL -CPPFLAGS += -I../SRC -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 7230bffebdc..ecc94987185 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -39,10 +39,12 @@ if env['WITH_BF_SNDFILE']: if env['WITH_BF_PYTHON']: sources += env.Glob('Python/*.cpp') incs += ' Python ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') + defs.append('WITH_PYTHON') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +# not optional with scons yet +defs.append('WITH_SAMPLERATE') + env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] ) diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile deleted file mode 100644 index 02a4068f3dc..00000000000 --- a/intern/audaspace/SDL/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_sdl -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += $(NAN_SDLCFLAGS) -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/SRC/Makefile b/intern/audaspace/SRC/Makefile deleted file mode 100644 index 0959ebb4bfa..00000000000 --- a/intern/audaspace/SRC/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_src -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_SAMPLERATE)/include -CPPFLAGS += -I../ffmpeg -CPPFLAGS += -I../FX -CPPFLAGS += -I../SDL -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index 623e99d5edc..5526b0dcf5a 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -246,13 +246,26 @@ void AUD_FFMPEGReader::seek(int position) { if(position >= 0) { + uint64_t st_time = m_formatCtx->start_time; + uint64_t seek_pos = position * AV_TIME_BASE / m_specs.rate; + + if (seek_pos < 0) { + seek_pos = 0; + } + + if (st_time != AV_NOPTS_VALUE) { + seek_pos += st_time; + } + + double pts_time_base = + av_q2d(m_formatCtx->streams[m_stream]->time_base); + uint64_t pts_st_time = + ((st_time != AV_NOPTS_VALUE) ? st_time : 0) + / pts_time_base / (uint64_t) AV_TIME_BASE; + // a value < 0 tells us that seeking failed - if(av_seek_frame(m_formatCtx, - -1, - (uint64_t)(((uint64_t)position * - (uint64_t)AV_TIME_BASE) / - (uint64_t)m_specs.rate), - AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0) + if(av_seek_frame(m_formatCtx, -1, seek_pos, + AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0) { avcodec_flush_buffers(m_codecCtx); m_position = position; @@ -273,9 +286,8 @@ void AUD_FFMPEGReader::seek(int position) if(packet.pts != AV_NOPTS_VALUE) { // calculate real position, and read to frame! - m_position = packet.pts * - av_q2d(m_formatCtx->streams[m_stream]->time_base) * - m_specs.rate; + m_position = (packet.pts - + pts_st_time) * pts_time_base * m_specs.rate; if(m_position < position) { @@ -298,6 +310,7 @@ void AUD_FFMPEGReader::seek(int position) } else { + fprintf(stderr, "seeking failed!\n"); // Seeking failed, do nothing. } } diff --git a/intern/audaspace/ffmpeg/Makefile b/intern/audaspace/ffmpeg/Makefile deleted file mode 100644 index 492ac83f532..00000000000 --- a/intern/audaspace/ffmpeg/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_ffmpeg -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += $(NAN_FFMPEGCFLAGS) -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/fftw/Makefile b/intern/audaspace/fftw/Makefile deleted file mode 100644 index c2d069d068c..00000000000 --- a/intern/audaspace/fftw/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_fftw -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I../intern -CPPFLAGS += -I../FX -CPPFLAGS += -I.. -CPPFLAGS += -I. -CPPFLAGS += -I$(BF_FFTW3)/include diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index d22d9e6c434..5e4e45d4e1e 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -28,7 +28,7 @@ #define __STDC_CONSTANT_MACROS #endif -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON #include "AUD_PyInit.h" #include "AUD_PyAPI.h" @@ -141,7 +141,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) AUD_device = dev; AUD_3ddevice = dynamic_cast<AUD_I3DDevice*>(AUD_device); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON if(g_pyinitialized) { g_device = (Device*)Device_empty(); @@ -162,7 +162,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) void AUD_exit() { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON if(g_device) { Py_XDECREF(g_device); @@ -176,7 +176,7 @@ void AUD_exit() AUD_3ddevice = NULL; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON static PyObject* AUD_getCDevice(PyObject* self) { if(g_device) @@ -197,7 +197,7 @@ PyObject* AUD_initPython() { PyObject* module = PyInit_aud(); PyModule_AddObject(module, "device", (PyObject *)PyCFunction_New(meth_getcdevice, NULL)); - PyDict_SetItemString(PySys_GetObject("modules"), "aud", module); + PyDict_SetItemString(PyImport_GetModuleDict(), "aud", module); if(AUD_device) { g_device = (Device*)Device_empty(); @@ -241,6 +241,7 @@ AUD_SoundInfo AUD_getInfo(AUD_Sound* sound) { info.specs = reader->getSpecs(); info.length = reader->getLength() / (float) info.specs.rate; + delete reader; } } catch(AUD_Exception&) @@ -721,7 +722,7 @@ int AUD_setDeviceVolume(AUD_Device* device, float volume) return true; } catch(AUD_Exception&) {} - + return false; } @@ -781,10 +782,20 @@ float* AUD_readSoundBuffer(const char* filename, float low, float high, AUD_Sound* sound; AUD_FileFactory file(filename); + + AUD_IReader* reader = file.createReader(); + AUD_SampleRate rate = reader->getSpecs().rate; + delete reader; + AUD_ChannelMapperFactory mapper(&file, specs); - AUD_LowpassFactory lowpass(&mapper, high); - AUD_HighpassFactory highpass(&lowpass, low); - AUD_EnvelopeFactory envelope(&highpass, attack, release, threshold, 0.1f); + sound = &mapper; + AUD_LowpassFactory lowpass(sound, high); + if(high < rate) + sound = &lowpass; + AUD_HighpassFactory highpass(sound, low); + if(low > 0) + sound = &highpass; + AUD_EnvelopeFactory envelope(sound, attack, release, threshold, 0.1f); AUD_LinearResampleFactory resampler(&envelope, specs); sound = &resampler; AUD_SquareFactory squaref(sound, sthreshold); @@ -797,7 +808,7 @@ float* AUD_readSoundBuffer(const char* filename, float low, float high, else if(additive) sound = ∑ - AUD_IReader* reader = sound->createReader(); + reader = sound->createReader(); if(reader == NULL) return NULL; diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index 08f2845de4f..71b5ca82430 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -58,7 +58,7 @@ typedef struct /** * Initializes FFMPEG if it is enabled. */ -extern void AUD_initOnce(); +extern void AUD_initOnce(void); /** * Initializes an audio device. @@ -72,17 +72,17 @@ extern int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize /** * Unitinitializes an audio device. */ -extern void AUD_exit(); +extern void AUD_exit(void); /** * Locks the playback device. */ -extern void AUD_lock(); +extern void AUD_lock(void); /** * Unlocks the device. */ -extern void AUD_unlock(); +extern void AUD_unlock(void); /** * Returns information about a sound. @@ -471,9 +471,9 @@ extern void AUD_muteSequencer(AUD_Sound* sequencer, AUD_SequencerEntry* entry, extern int AUD_readSound(AUD_Sound* sound, sample_t* buffer, int length); -extern void AUD_startPlayback(); +extern void AUD_startPlayback(void); -extern void AUD_stopPlayback(); +extern void AUD_stopPlayback(void); extern void AUD_seekSequencer(AUD_Channel* handle, float time); @@ -483,7 +483,7 @@ extern float AUD_getSequencerPosition(AUD_Channel* handle); extern void AUD_setSyncCallback(AUD_syncFunction function, void* data); #endif -extern int AUD_doesPlayback(); +extern int AUD_doesPlayback(void); #ifdef __cplusplus } diff --git a/intern/audaspace/intern/AUD_DefaultMixer.cpp b/intern/audaspace/intern/AUD_DefaultMixer.cpp index 12faa10d866..2b641b6bd1a 100644 --- a/intern/audaspace/intern/AUD_DefaultMixer.cpp +++ b/intern/audaspace/intern/AUD_DefaultMixer.cpp @@ -24,7 +24,9 @@ */ #include "AUD_DefaultMixer.h" +#ifdef WITH_SAMPLERATE #include "AUD_SRCResampleReader.h" +#endif #include "AUD_ChannelMapperReader.h" #include "AUD_ChannelMapperFactory.h" @@ -50,10 +52,12 @@ AUD_IReader* AUD_DefaultMixer::prepare(AUD_IReader* reader) specs.channels = m_specs.channels; } +#ifdef WITH_SAMPLERATE // resample if(specs.rate != m_specs.rate) reader = new AUD_SRCResampleReader(reader, m_specs.specs); - +#endif + // rechannel if(specs.channels != m_specs.channels) reader = new AUD_ChannelMapperReader(reader, diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h index bd67259449a..6f18bdbe2d1 100644 --- a/intern/audaspace/intern/AUD_PyInit.h +++ b/intern/audaspace/intern/AUD_PyInit.h @@ -26,7 +26,7 @@ #ifndef AUD_PYINIT #define AUD_PYINIT -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON #include "Python.h" #ifdef __cplusplus @@ -36,7 +36,7 @@ extern "C" { /** * Initalizes the Python module. */ -extern PyObject* AUD_initPython(); +extern PyObject* AUD_initPython(void); #ifdef __cplusplus } diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp index 69293205498..5b546ca9d58 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.cpp +++ b/intern/audaspace/intern/AUD_SequencerReader.cpp @@ -188,7 +188,16 @@ void AUD_SequencerReader::read(int & length, sample_t* & buffer) delete strip->reader; if(strip->old_sound) - strip->reader = m_mixer->prepare(strip->old_sound->createReader()); + { + try + { + strip->reader = m_mixer->prepare(strip->old_sound->createReader()); + } + catch(AUD_Exception) + { + strip->reader = NULL; + } + } else strip->reader = NULL; } diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile deleted file mode 100644 index b89a8bcd397..00000000000 --- a/intern/audaspace/intern/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = audaspace -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) - -ifeq ($(WITH_SDL),true) - CPPFLAGS += -DWITH_SDL - CPPFLAGS += $(NAN_SDLCFLAGS) -endif - -ifeq ($(WITH_OPENAL),true) - CPPFLAGS += -DWITH_OPENAL - CPPFLAGS += -I../OpenAL -endif - -ifeq ($(WITH_JACK),true) - CPPFLAGS += -DWITH_JACK - CPPFLAGS += $(NAN_JACKCFLAGS) - CPPFLAGS += -I../jack -endif - -ifeq ($(WITH_FFMPEG),true) - CPPFLAGS += -DWITH_FFMPEG - CPPFLAGS += $(NAN_FFMPEGCFLAGS) -endif - -ifeq ($(WITH_SNDFILE),true) - CPPFLAGS += -DWITH_SNDFILE - CPPFLAGS += -I../sndfile - CPPFLAGS += -I$(NAN_SNDFILE)/include -endif - -CPPFLAGS += -I$(NAN_SAMPLERATE)/include/ -CPPFLAGS += -I../ffmpeg -CPPFLAGS += -I../FX -CPPFLAGS += -I../SDL -CPPFLAGS += -I../SRC -CPPFLAGS += -I../Python -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/jack/AUD_JackDevice.cpp b/intern/audaspace/jack/AUD_JackDevice.cpp index 5aa3f7b3fc1..0d72e85c351 100644 --- a/intern/audaspace/jack/AUD_JackDevice.cpp +++ b/intern/audaspace/jack/AUD_JackDevice.cpp @@ -236,9 +236,9 @@ AUD_JackDevice::AUD_JackDevice(std::string name, AUD_DeviceSpecs specs, int buff create(); m_valid = true; - m_playing = false; m_sync = 0; m_syncFunc = NULL; + m_nextState = m_state = jack_transport_query(m_client, NULL); pthread_mutex_init(&m_mixingLock, NULL); pthread_cond_init(&m_mixingCondition, NULL); @@ -307,11 +307,13 @@ void AUD_JackDevice::playing(bool playing) void AUD_JackDevice::startPlayback() { jack_transport_start(m_client); + m_nextState = JackTransportRolling; } void AUD_JackDevice::stopPlayback() { jack_transport_stop(m_client); + m_nextState = JackTransportStopped; } void AUD_JackDevice::seekPlayback(float time) @@ -335,5 +337,10 @@ float AUD_JackDevice::getPlaybackPosition() bool AUD_JackDevice::doesPlayback() { - return jack_transport_query(m_client, NULL) != JackTransportStopped; + jack_transport_state_t state = jack_transport_query(m_client, NULL); + + if(state != m_state) + m_nextState = m_state = state; + + return m_nextState != JackTransportStopped; } diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h index 418992e0db1..cc3cf7d6598 100644 --- a/intern/audaspace/jack/AUD_JackDevice.h +++ b/intern/audaspace/jack/AUD_JackDevice.h @@ -87,9 +87,14 @@ private: static int jack_sync(jack_transport_state_t state, jack_position_t* pos, void* data); /** - * Last Jack Transport playing state. + * Next Jack Transport state (-1 if not expected to change). */ - bool m_playing; + jack_transport_state_t m_nextState; + + /** + * Current jack transport status. + */ + jack_transport_state_t m_state; /** * Syncronisation state. diff --git a/intern/audaspace/jack/Makefile b/intern/audaspace/jack/Makefile deleted file mode 100644 index 23cadf559c0..00000000000 --- a/intern/audaspace/jack/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): GSR -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_jack -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -# If we are here, jack is enable. -CPPFLAGS += -DWITH_JACK -CPPFLAGS += $(NAN_JACKCFLAGS) - -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/audaspace/make/msvc_9_0/audaspace.vcproj b/intern/audaspace/make/msvc_9_0/audaspace.vcproj deleted file mode 100644 index e6d83f18b01..00000000000 --- a/intern/audaspace/make/msvc_9_0/audaspace.vcproj +++ /dev/null @@ -1,924 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_audaspace"
- ProjectGUID="{87032FD2-9BA0-6B43-BE33-8902BA8F9172}"
- RootNamespace="audaspace"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\audaspace.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libaudaspace.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\audaspace.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libaudaspace.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\audaspace.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libaudaspace.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\Python;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\fftw3\include;..\..\..\..\..\lib\windows\python\include\python3.1"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\audaspace.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\audaspace\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libaudaspace.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\AUD_3DMath.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Buffer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Buffer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_BufferReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_BufferReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_C-API.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_C-API.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ChannelMapperFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ChannelMapperFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ChannelMapperReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ChannelMapperReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterFunctions.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterFunctions.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ConverterReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_DefaultMixer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_DefaultMixer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_FileFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_FileFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_I3DDevice.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_IDevice.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_IFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_IReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_LinearResampleFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_LinearResampleFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_LinearResampleReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_LinearResampleReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Mixer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Mixer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_MixerFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_MixerFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_NULLDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_NULLDevice.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_PyInit.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ReadDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ReadDevice.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Reference.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_ResampleFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SequencerFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SequencerFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SequencerReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SequencerReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SilenceFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SilenceFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SilenceReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SilenceReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SinusFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SinusFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SinusReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SinusReader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SoftwareDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_SoftwareDevice.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_Space.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_StreamBufferFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\AUD_StreamBufferFactory.h"
- >
- </File>
- </Filter>
- <Filter
- Name="ffmpeg"
- >
- <File
- RelativePath="..\..\ffmpeg\AUD_FFMPEGFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\ffmpeg\AUD_FFMPEGFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\ffmpeg\AUD_FFMPEGReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\ffmpeg\AUD_FFMPEGReader.h"
- >
- </File>
- </Filter>
- <Filter
- Name="FX"
- >
- <File
- RelativePath="..\..\FX\AUD_AccumulatorFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_AccumulatorFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_BaseIIRFilterReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_BaseIIRFilterReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ButterworthFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ButterworthFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_CallbackIIRFilterReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_CallbackIIRFilterReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DelayFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DelayFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DelayReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DelayReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DoubleFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DoubleFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DoubleReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_DoubleReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EffectFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EffectFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EffectReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EffectReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EnvelopeFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_EnvelopeFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_FaderFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_FaderFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_FaderReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_FaderReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_HighpassFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_HighpassFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_IIRFilterFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_IIRFilterFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_IIRFilterReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_IIRFilterReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LimiterFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LimiterFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LimiterReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LimiterReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LoopFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LoopFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LoopReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LoopReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LowpassFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_LowpassFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PingPongFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PingPongFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PitchFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PitchFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PitchReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_PitchReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_RectifyFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_RectifyFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ReverseFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ReverseFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ReverseReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_ReverseReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SquareFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SquareFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SumFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SumFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SuperposeFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SuperposeFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SuperposeReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_SuperposeReader.h"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_VolumeFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FX\AUD_VolumeFactory.h"
- >
- </File>
- </Filter>
- <Filter
- Name="OpenAL"
- >
- <File
- RelativePath="..\..\OpenAL\AUD_OpenALDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\OpenAL\AUD_OpenALDevice.h"
- >
- </File>
- </Filter>
- <Filter
- Name="SDL"
- >
- <File
- RelativePath="..\..\SDL\AUD_SDLDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\SDL\AUD_SDLDevice.h"
- >
- </File>
- </Filter>
- <Filter
- Name="SRC"
- >
- <File
- RelativePath="..\..\SRC\AUD_SRCResampleFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\SRC\AUD_SRCResampleFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\SRC\AUD_SRCResampleReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\SRC\AUD_SRCResampleReader.h"
- >
- </File>
- </Filter>
- <Filter
- Name="jack"
- >
- <File
- RelativePath="..\..\jack\AUD_JackDevice.cpp"
- >
- </File>
- <File
- RelativePath="..\..\jack\AUD_JackDevice.h"
- >
- </File>
- </Filter>
- <Filter
- Name="sndfile"
- >
- <File
- RelativePath="..\..\sndfile\AUD_SndFileFactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\sndfile\AUD_SndFileFactory.h"
- >
- </File>
- <File
- RelativePath="..\..\sndfile\AUD_SndFileReader.cpp"
- >
- </File>
- <File
- RelativePath="..\..\sndfile\AUD_SndFileReader.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Python"
- >
- <File
- RelativePath="..\..\Python\AUD_PyAPI.cpp"
- >
- </File>
- <File
- RelativePath="..\..\Python\AUD_PyAPI.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/audaspace/sndfile/Makefile b/intern/audaspace/sndfile/Makefile deleted file mode 100644 index 0012a11203e..00000000000 --- a/intern/audaspace/sndfile/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = aud_sndfile -DIR = $(OCGDIR)/intern/audaspace - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_SNDFILE)/include -CPPFLAGS += -I../intern -CPPFLAGS += -I.. -CPPFLAGS += -I. diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index 91500712a4c..7e36f255268 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ./intern ./extern @@ -36,6 +36,43 @@ SET(INC ../../source/blender/makesdna ) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/BOP_BBox.cpp + intern/BOP_BSPNode.cpp + intern/BOP_BSPTree.cpp + intern/BOP_Edge.cpp + intern/BOP_Face.cpp + intern/BOP_Face2Face.cpp + intern/BOP_Interface.cpp + intern/BOP_MathUtils.cpp + intern/BOP_Merge.cpp + intern/BOP_Merge2.cpp + intern/BOP_Mesh.cpp + intern/BOP_Segment.cpp + intern/BOP_Splitter.cpp + intern/BOP_Tag.cpp + intern/BOP_Triangulator.cpp + intern/BOP_Vertex.cpp -BLENDERLIB(bf_intern_bop "${SRC}" "${INC}") + extern/BOP_Interface.h + intern/BOP_BBox.h + intern/BOP_BSPNode.h + intern/BOP_BSPTree.h + intern/BOP_Chrono.h + intern/BOP_Edge.h + intern/BOP_Face.h + intern/BOP_Face2Face.h + intern/BOP_Indexs.h + intern/BOP_MathUtils.h + intern/BOP_Merge.h + intern/BOP_Merge2.h + intern/BOP_Mesh.h + intern/BOP_Misc.h + intern/BOP_Segment.h + intern/BOP_Splitter.h + intern/BOP_Tag.h + intern/BOP_Triangulator.h + intern/BOP_Vertex.h +) + +blender_add_lib(bf_intern_bop "${SRC}" "${INC}") diff --git a/intern/boolop/Makefile b/intern/boolop/Makefile deleted file mode 100644 index a7a08f665c7..00000000000 --- a/intern/boolop/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# bsp main makefile. -# - -include nan_definitions.mk - -LIBNAME = boolop -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -# not yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_BOOLOP) ] || mkdir $(NAN_BOOLOP) - @[ -d $(NAN_BOOLOP)/include ] || mkdir $(NAN_BOOLOP)/include - @[ -d $(NAN_BOOLOP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BOOLOP)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libboolop.a $(NAN_BOOLOP)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_BOOLOP)/include/ - - - - diff --git a/intern/boolop/intern/BOP_BSPNode.cpp b/intern/boolop/intern/BOP_BSPNode.cpp index d9b3941cf38..ffb940bcf40 100644 --- a/intern/boolop/intern/BOP_BSPNode.cpp +++ b/intern/boolop/intern/BOP_BSPNode.cpp @@ -59,7 +59,7 @@ BOP_BSPNode::~BOP_BSPNode() * @param plane face plane. */ -unsigned int BOP_BSPNode::addFace(BOP_BSPPoints pts, +unsigned int BOP_BSPNode::addFace(const BOP_BSPPoints& pts, const MT_Plane3& plane ) { unsigned int newDeep = 0; diff --git a/intern/boolop/intern/BOP_BSPNode.h b/intern/boolop/intern/BOP_BSPNode.h index 9cc9a9d2a58..9ebd66976c4 100644 --- a/intern/boolop/intern/BOP_BSPNode.h +++ b/intern/boolop/intern/BOP_BSPNode.h @@ -33,7 +33,7 @@ #include "BOP_Face.h" typedef vector<MT_Point3> BOP_BSPPoints; -typedef vector<MT_Point3>::iterator BOP_IT_BSPPoints; +typedef vector<MT_Point3>::const_iterator BOP_IT_BSPPoints; class BOP_BSPNode { @@ -47,7 +47,7 @@ public: // Construction methods BOP_BSPNode(const MT_Plane3& plane); ~BOP_BSPNode(); - unsigned int addFace(BOP_BSPPoints pts, + unsigned int addFace(const BOP_BSPPoints& pts, const MT_Plane3& plane); BOP_TAG classifyFace(const MT_Point3& p1, const MT_Point3& p2, diff --git a/intern/boolop/intern/BOP_Interface.cpp b/intern/boolop/intern/BOP_Interface.cpp index 99116b7d87d..ff15751b797 100644 --- a/intern/boolop/intern/BOP_Interface.cpp +++ b/intern/boolop/intern/BOP_Interface.cpp @@ -80,7 +80,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType opType, CSG_FaceIteratorDescriptor obBFaces, CSG_VertexIteratorDescriptor obBVertices) { - #ifdef DEBUG + #ifdef BOP_DEBUG cout << "BEGIN BOP_performBooleanOperation" << endl; #endif @@ -118,7 +118,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType opType, // Invert the output mesh if is required *outputMesh = BOP_exportMesh(&meshC, invertMeshC); - #ifdef DEBUG + #ifdef BOP_DEBUG cout << "END BOP_performBooleanOperation" << endl; #endif @@ -141,7 +141,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, bool invertMeshA, bool invertMeshB) { - #ifdef DEBUG + #ifdef BOP_DEBUG BOP_Chrono chrono; float t = 0.0f; float c = 0.0f; @@ -156,7 +156,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, BOP_BSPTree bspB; bspB.addMesh(meshC, *facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Create BSP " << c << endl; #endif @@ -172,7 +172,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, if ((0.25*facesB->size()) > bspA.getDeep()) BOP_meshFilter(meshC, facesB, &bspA); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "mesh Filter " << c << endl; #endif @@ -180,7 +180,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Face 2 Face BOP_Face2Face(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Face2Face " << c << endl; #endif @@ -189,7 +189,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, BOP_meshClassify(meshC,facesA,&bspB); BOP_meshClassify(meshC,facesB,&bspA); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Classification " << c << endl; #endif @@ -197,7 +197,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Process overlapped faces BOP_removeOverlappedFaces(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Remove overlap " << c << endl; #endif @@ -205,7 +205,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Sew two meshes BOP_sew(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Sew " << c << endl; #endif @@ -238,7 +238,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, #endif #endif - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Merge faces " << c << endl; cout << "Total " << t << endl; diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp index ad9f832ef01..2ef8b5b30b7 100644 --- a/intern/boolop/intern/BOP_Merge2.cpp +++ b/intern/boolop/intern/BOP_Merge2.cpp @@ -70,7 +70,7 @@ void dumpmesh ( BOP_Mesh *m, bool force ) } if( nonmanifold ) cout << nonmanifold << " edges detected" << endl; -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "---------------------------" << endl; BOP_Edges edges = m->getEdges(); @@ -130,7 +130,7 @@ void BOP_Merge2::mergeFaces(BOP_Mesh *m, BOP_Index v) { m_mesh = m; -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "##############################" << endl; #endif cleanup( ); @@ -147,7 +147,7 @@ void BOP_Merge2::mergeFaces(BOP_Mesh *m, BOP_Index v) // ... and merge new faces if( cont ) cont = mergeFaces(); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "called mergeFaces " << cont << endl; #endif // ... until the merge is not succesful @@ -186,7 +186,7 @@ void clean_nonmanifold( BOP_Mesh *m ) unsigned short facecount = 0; bool found = false; BOP_Indexs vertList; -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " first edge is " << (*it) << endl; #endif vertList.push_back(first); @@ -214,7 +214,7 @@ void clean_nonmanifold( BOP_Mesh *m ) edge = NULL; } if( !edge ) break; -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " next edge is " << edge << endl; #endif tmpface = m->getFace(edge->getFaces().front()); @@ -231,7 +231,7 @@ void clean_nonmanifold( BOP_Mesh *m ) } if(found) { edge = *it; -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " --> found a loop" << endl; #endif if( vertList.size() == 3 ) { @@ -241,7 +241,7 @@ void clean_nonmanifold( BOP_Mesh *m ) BOP_Face4 *face = (BOP_Face4 *)m->getFace(edge->getFaces().front()); face->getNeighbours(first,last,next,last); } else { -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "loop has " << vertList.size() << "verts"; #endif continue; @@ -253,7 +253,7 @@ void clean_nonmanifold( BOP_Mesh *m ) BOP_Face3 *f = new BOP_Face3(next,first,last, oface1->getPlane(),oface1->getOriginalFace()); m->addFace( f ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " face is backward: " << f << endl; #endif @@ -261,7 +261,7 @@ void clean_nonmanifold( BOP_Mesh *m ) BOP_Face3 *f = new BOP_Face3(last,first,next, oface1->getPlane(),oface1->getOriginalFace()); m->addFace( f ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " face is forward: " << f << endl; #endif } @@ -366,7 +366,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) BOP_LFaces facesByOriginalFace; BOP_Index v = mergeVertices[i]; BOP_Vertex *vert = m_mesh->getVertex(v); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "i = " << i << ", v = " << v << ", vert = " << vert << endl; if (v==48) cout << "found vert 48" << endl; @@ -381,7 +381,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) vert->setTAG(BROKEN); break; case 2: { -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "size of fBOF = " << facesByOriginalFace.size() << endl; #endif BOP_Faces ff = facesByOriginalFace.front(); @@ -391,7 +391,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) // look for two edges adjacent to v which contain both ofaces BOP_Indexs edges = vert->getEdges(); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " ff has " << ff.size() << " faces" << endl; cout << " fb has " << fb.size() << " faces" << endl; cout << " v has " << edges.size() << " edges" << endl; @@ -400,14 +400,14 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) ++it ) { BOP_Edge *edge = m_mesh->getEdge(*it); BOP_Indexs faces = edge->getFaces(); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " " << edge << " has " << edge->getFaces().size() << " faces" << endl; #endif if( faces.size() == 2 ) { BOP_Face *f0 = m_mesh->getFace(faces[0]); BOP_Face *f1 = m_mesh->getFace(faces[1]); if( f0->getOriginalFace() != f1->getOriginalFace() ) { -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " " << f0 << endl; cout << " " << f1 << endl; #endif @@ -416,14 +416,14 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) } } if(ecount == 2) { -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " edge indexes are " << eindexs[0]; cout << " and " << eindexs[1] << endl; #endif BOP_Edge *edge = m_mesh->getEdge(eindexs[0]); BOP_Index N = edge->getVertex1(); if(N == v) N = edge->getVertex2(); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " ## OK, replace "<<v<<" with "<<N << endl; #endif mergeVertex(ff , v, N ); @@ -437,7 +437,7 @@ bool BOP_Merge2::mergeFaces(BOP_Indexs &mergeVertices) } didMerge = true; } -#ifdef DEBUG +#ifdef BOP_DEBUG else { cout << " HUH: ecount was " << ecount << endl; } @@ -461,7 +461,7 @@ void BOP_Merge2::mergeVertex(BOP_Faces &faces, BOP_Index v1, BOP_Index v2) else mergeVertex((BOP_Face4 *) *face, v1, v2); (*face)->setTAG(BROKEN); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << " breaking " << (*face) << endl; #endif } @@ -506,7 +506,7 @@ void BOP_Merge2::mergeVertex(BOP_Face3 *face, BOP_Index v1, BOP_Index v2) if( prev != v2 && next != v2 ) { m_mesh->addFace( new BOP_Face3(prev,v2,next, face->getPlane(),face->getOriginalFace()) ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "mv3: add " << prev << "," << v2 << "," << next << endl; } else { cout << "mv3: vertex already in tri: doing nothing" << endl; @@ -524,7 +524,7 @@ void BOP_Merge2::mergeVertex(BOP_Face4 *face, BOP_Index v1, BOP_Index v2) if( prev == v2 || next == v2 ) { m_mesh->addFace( new BOP_Face3(prev,next,opp, face->getPlane(),face->getOriginalFace()) ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "mv4a: add " << prev << "," << next << "," << opp << endl; #endif } @@ -532,7 +532,7 @@ void BOP_Merge2::mergeVertex(BOP_Face4 *face, BOP_Index v1, BOP_Index v2) else { m_mesh->addFace( new BOP_Face4(prev,v2,next,opp, face->getPlane(),face->getOriginalFace()) ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "mv4b: add "<<prev<<","<<v2<<","<<next<<","<<opp<<endl; #endif } @@ -570,7 +570,7 @@ bool BOP_Merge2::createQuads() // Set triangles to BROKEN deleteFace(m_mesh, *faceI); deleteFace(m_mesh, *faceJ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "createQuad: del " << *faceI << endl; cout << "createQuad: del " << *faceJ << endl; cout << "createQuad: add " << faceK << endl; @@ -602,7 +602,7 @@ bool BOP_Merge2::createQuads() // Set triangles to BROKEN deleteFace(m_mesh, *faceI); deleteFace(m_mesh, *faceJ); -#ifdef DEBUG +#ifdef BOP_DEBUG cout << "createQuad: del " << *faceI << endl; cout << "createQuad: del " << *faceJ << endl; cout << "createQuad: add " << faceK << endl; diff --git a/intern/boolop/intern/Makefile b/intern/boolop/intern/Makefile deleted file mode 100644 index 6fc8d448a10..00000000000 --- a/intern/boolop/intern/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# string intern Makefile -# - -LIBNAME = boolop -DIR = $(OCGDIR)/intern/$(LIBNAME) -DIRS = common - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I../extern -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include -CPPFLAGS += -I$(NAN_CONTAINER)/include -CPPFLAGS += -I../../../source/blender/makesdna -CPPFLAGS += -I../../../source/blender/blenlib -CPPFLAGS += -Icommon - - diff --git a/intern/boolop/make/msvc_6_0/boolop.dsp b/intern/boolop/make/msvc_6_0/boolop.dsp deleted file mode 100644 index d4e0025adc2..00000000000 --- a/intern/boolop/make/msvc_6_0/boolop.dsp +++ /dev/null @@ -1,222 +0,0 @@ -# Microsoft Developer Studio Project File - Name="boolop" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=boolop - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "boolop.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "boolop.mak" CFG="boolop - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "boolop - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "boolop - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "boolop - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib folder XCOPY /Y .\release\*.lib ..\..\..\..\..\lib\windows\boolop\lib\*.lib
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "boolop - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\blender\makesdna\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "../../extern" /I "..\..\..\..\..\lib\windows\guardedalloc\include\\" /I "..\..\..\..\source\blender\blenlib\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "boolop - Win32 Release"
-# Name "boolop - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BBox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPNode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPTree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Edge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face2Face.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Interface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_MathUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Merge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Mesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Segment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Tag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Triangulator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Vertex.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPNode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_BSPTree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Chrono.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Edge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Face2Face.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Indexs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_MathUtils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Merge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Segment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Tag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Triangulator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BOP_Vertex.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/boolop/make/msvc_7_0/boolop.vcproj b/intern/boolop/make/msvc_7_0/boolop.vcproj deleted file mode 100644 index 6e6d6abeb43..00000000000 --- a/intern/boolop/make/msvc_7_0/boolop.vcproj +++ /dev/null @@ -1,372 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="boolop" - ProjectGUID="{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\debug\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libboolop.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BOOLOP files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libboolop.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BOOLOP files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libboolop.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BOOLOP files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\boolop\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libboolop.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BOOLOP files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_7\intern\boolop\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\boolop\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="intern" - Filter=""> - <Filter - Name="Source Files" - Filter=""> - <File - RelativePath="..\..\intern\BOP_BBox.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_BSPNode.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_BSPTree.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Edge.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Face.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Face2Face.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Interface.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_MathUtils.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Merge.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Merge2.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Mesh.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Segment.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Splitter.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Tag.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Triangulator.cpp"> - </File> - <File - RelativePath="..\..\intern\BOP_Vertex.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> - <File - RelativePath="..\..\intern\BOP_BBox.h"> - </File> - <File - RelativePath="..\..\intern\BOP_BSPNode.h"> - </File> - <File - RelativePath="..\..\intern\BOP_BSPTree.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Chrono.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Edge.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Face.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Face2Face.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Indexs.h"> - </File> - <File - RelativePath="..\..\intern\BOP_MathUtils.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Merge.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Merge2.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Mesh.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Misc.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Segment.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Splitter.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Tag.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Triangulator.h"> - </File> - <File - RelativePath="..\..\intern\BOP_Vertex.h"> - </File> - </Filter> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\extern\BOP_Interface.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/boolop/make/msvc_9_0/boolop.vcproj b/intern/boolop/make/msvc_9_0/boolop.vcproj deleted file mode 100644 index 357d189376a..00000000000 --- a/intern/boolop/make/msvc_9_0/boolop.vcproj +++ /dev/null @@ -1,488 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_boolop"
- ProjectGUID="{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}"
- RootNamespace="boolop"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\debug\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libboolop.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BOOLOP files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libboolop.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BOOLOP files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libboolop.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BOOLOP files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\extern;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\source\blender\blenlib;..\..\..\..\source\blender\makesdna;$(NOINHERIT)"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\boolop\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libboolop.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BOOLOP files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\boolop\include MKDIR ..\..\..\..\..\build\msvc_9\intern\boolop\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\boolop\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <Filter
- Name="Source Files"
- >
- <File
- RelativePath="..\..\intern\BOP_BBox.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_BSPNode.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_BSPTree.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Edge.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Face.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Face2Face.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Interface.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_MathUtils.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Merge.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Merge2.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Mesh.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Segment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Splitter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Tag.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Triangulator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Vertex.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- >
- <File
- RelativePath="..\..\intern\BOP_BBox.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_BSPNode.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_BSPTree.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Chrono.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Edge.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Face.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Face2Face.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Indexs.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_MathUtils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Merge.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Merge2.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Mesh.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Misc.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Segment.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Splitter.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Tag.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Triangulator.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BOP_Vertex.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\extern\BOP_Interface.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index debbc86c240..2e615314543 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -24,13 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ./intern ../container ../moto/include ../memutil ) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/BSP_CSGMesh.cpp + intern/BSP_MeshPrimitives.cpp + intern/CSG_BooleanOps.cpp -BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}") + extern/CSG_BooleanOps.h + intern/BSP_CSGException.h + intern/BSP_CSGMesh.h + intern/BSP_CSGMesh_CFIterator.h + intern/BSP_MeshPrimitives.h +) + +blender_add_lib(bf_intern_bsp "${SRC}" "${INC}") diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile deleted file mode 100644 index cd1653206a6..00000000000 --- a/intern/bsp/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# bsp main makefile. -# - -include nan_definitions.mk - -LIBNAME = bsp -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -# not yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_BSP) ] || mkdir $(NAN_BSP) - @[ -d $(NAN_BSP)/include ] || mkdir $(NAN_BSP)/include - @[ -d $(NAN_BSP)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_BSP)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libbsp.a $(NAN_BSP)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_BSP)/include/ - - diff --git a/intern/bsp/intern/Makefile b/intern/bsp/intern/Makefile deleted file mode 100644 index 99a21fda7d4..00000000000 --- a/intern/bsp/intern/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# string intern Makefile -# - -LIBNAME = bsp -DIR = $(OCGDIR)/intern/$(LIBNAME) -DIRS = common - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I../extern -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include -CPPFLAGS += -I$(NAN_CONTAINER)/include -CPPFLAGS += -Icommon - - diff --git a/intern/bsp/make/msvc6_0/bsplib.dsp b/intern/bsp/make/msvc6_0/bsplib.dsp deleted file mode 100644 index 703a6326d3a..00000000000 --- a/intern/bsp/make/msvc6_0/bsplib.dsp +++ /dev/null @@ -1,138 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bsplib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=bsplib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "bsplib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "bsplib.mak" CFG="bsplib - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "bsplib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "bsplib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "bsplib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../../../../lib/windows/memutil/include" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\libbsp.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\*.lib ..\..\..\..\..\lib\windows\bsp\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "bsplib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bsp\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/memutil" /I "../.." /I "../../../../../lib/windows/moto/include" /I "../../../../../lib/windows/container/include" /I "../../../../../lib/windows/memutil/include" /I "..\..\..\container" /I "..\..\..\moto\include" /I "..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bsp\debug\libbsp.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\bsp\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\*.lib ..\..\..\..\..\lib\windows\bsp\lib\debug\*.a ECHO Copying Debug info. XCOPY /Y ..\..\..\..\obj\windows\intern\bsp\debug\vc60.* ..\..\..\..\..\lib\windows\bsp\lib\debug\ ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "bsplib - Win32 Release"
-# Name "bsplib - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGISplitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_CSGMesh_CFIterator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_MeshPrimitives.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\BSP_MeshPrimitives.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\CSG_BooleanOps.cpp
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\CSG_BooleanOps.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/bsp/make/msvc6_0/bsplib.dsw b/intern/bsp/make/msvc6_0/bsplib.dsw deleted file mode 100644 index de8cdcd1d33..00000000000 --- a/intern/bsp/make/msvc6_0/bsplib.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bsplib"=.\bsplib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/bsp/make/msvc_7_0/bsplib.sln b/intern/bsp/make/msvc_7_0/bsplib.sln deleted file mode 100644 index e8c116b639e..00000000000 --- a/intern/bsp/make/msvc_7_0/bsplib.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsplib", "bsplib.vcproj", "{20F0EE62-A21A-46B7-B425-7923F4674B4F}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Debug.ActiveCfg = Debug|Win32 - {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Debug.Build.0 = Debug|Win32 - {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Release.ActiveCfg = Release|Win32 - {20F0EE62-A21A-46B7-B425-7923F4674B4F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/bsp/make/msvc_7_0/bsplib.vcproj b/intern/bsp/make/msvc_7_0/bsplib.vcproj deleted file mode 100644 index 59fb9f3691d..00000000000 --- a/intern/bsp/make/msvc_7_0/bsplib.vcproj +++ /dev/null @@ -1,282 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="bsplib" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\debug\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libbsp.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BSP files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libbsp.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BSP files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libbsp.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BSP files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\container\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\bsplib.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\bsp\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libbsp.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying BSP files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_7\intern\bsp\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\bsp\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\BSP_CSGException.h"> - </File> - <File - RelativePath="..\..\intern\BSP_CSGMesh.cpp"> - </File> - <File - RelativePath="..\..\intern\BSP_CSGMesh.h"> - </File> - <File - RelativePath="..\..\intern\BSP_CSGMesh_CFIterator.h"> - </File> - <File - RelativePath="..\..\intern\BSP_MeshPrimitives.cpp"> - </File> - <File - RelativePath="..\..\intern\BSP_MeshPrimitives.h"> - </File> - <File - RelativePath="..\..\intern\CSG_BooleanOps.cpp"> - </File> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\extern\CSG_BooleanOps.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/bsp/make/msvc_9_0/bsplib.vcproj b/intern/bsp/make/msvc_9_0/bsplib.vcproj deleted file mode 100644 index ed6978b8229..00000000000 --- a/intern/bsp/make/msvc_9_0/bsplib.vcproj +++ /dev/null @@ -1,372 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_bsplib"
- ProjectGUID="{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}"
- RootNamespace="bsplib"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\container\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bsp\debug\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bsp\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libbsp.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BSP files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bsp\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\bsp\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\container\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bsp\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bsp\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bsp\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bsp\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libbsp.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BSP files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bsp\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\bsp\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\container\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libbsp.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BSP files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bsp\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\bsp\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include;..\..\..\..\..\build\msvc_9\intern\container\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug\bsplib.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\bsp\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libbsp.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying BSP files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\bsp\include MKDIR ..\..\..\..\..\build\msvc_9\intern\bsp\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\bsp\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\BSP_CSGException.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BSP_CSGMesh.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BSP_CSGMesh.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BSP_CSGMesh_CFIterator.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\BSP_MeshPrimitives.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\BSP_MeshPrimitives.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\CSG_BooleanOps.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\extern\CSG_BooleanOps.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/bsp/test/BSP_GhostTest/Makefile b/intern/bsp/test/BSP_GhostTest/Makefile deleted file mode 100644 index 801c34bab83..00000000000 --- a/intern/bsp/test/BSP_GhostTest/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# BSP_GhostTest Makefile -# - -LIBNAME = BSP_GhostTest -SOURCEDIR = intern/bsp/test/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BSP)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include -CPPFLAGS += -I$(NAN_CONTAINER)/include -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I../../extern/ - -ifeq ($(OS),windows) - CPPFLAGS += -I$(NAN_LIBDIR)/windows/glut-3.7/include -endif - - - diff --git a/intern/bsp/test/Makefile b/intern/bsp/test/Makefile deleted file mode 100644 index 91e4497b267..00000000000 --- a/intern/bsp/test/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# bsp test makefile. -# - -LIBNAME = bsp -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) - -include nan_compile.mk - -DIRS = BSP_GhostTest - -include nan_subdirs.mk - -include nan_link.mk - -LIBS = $(OCGDIR)/intern/$(LIBNAME)/test/BSP_GhostTest/$(DEBUG_DIR)libBSP_GhostTest.a -LIBS += $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)libbsp.a - -SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a -SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a -SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a - -ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd")) - LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu -endif - -all debug:: $(LIBS) $(DIR)/$(DEBUG_DIR)BSPGhostTest - -$(DIR)/$(DEBUG_DIR)BSPGhostTest: - @echo "****> linking $@ in $(DIR)" - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)BSPGhostTest $(LIBS) $(SLIBS) $(LLIBS) $(DADD) - -clean:: - $(RM) $(DIR)/BSPGhostTest $(DIR)/debug/BSPGhostTest - -test:: all - $(DIR)/BSPGhostTest - - - - - diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 9ae684ec542..7f15854e538 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -24,8 +24,18 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +set(INC + . +) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/CTR_List.cpp -BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}") + CTR_List.h + CTR_Map.h + CTR_TaggedIndex.h + CTR_TaggedSetOps.h + CTR_UHeap.h +) + +blender_add_lib(bf_intern_ctr "${SRC}" "${INC}") diff --git a/intern/container/Makefile b/intern/container/Makefile deleted file mode 100644 index 8a9c038f0ee..00000000000 --- a/intern/container/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# container main makefile. -# - -include nan_definitions.mk - -LIBNAME = container -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_CONTAINER) ] || mkdir $(NAN_CONTAINER) - @[ -d $(NAN_CONTAINER)/include ] || mkdir $(NAN_CONTAINER)/include - @[ -d $(NAN_CONTAINER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_CONTAINER)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libcontainer.a $(NAN_CONTAINER)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh *.h $(NAN_CONTAINER)/include/ - diff --git a/intern/container/intern/Makefile b/intern/container/intern/Makefile deleted file mode 100644 index 8bca6936d6b..00000000000 --- a/intern/container/intern/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# container intern Makefile -# - -LIBNAME = container -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I.. - diff --git a/intern/container/make/msvc_6_0/container.dsp b/intern/container/make/msvc_6_0/container.dsp deleted file mode 100644 index ac565c4c1ec..00000000000 --- a/intern/container/make/msvc_6_0/container.dsp +++ /dev/null @@ -1,133 +0,0 @@ -# Microsoft Developer Studio Project File - Name="container" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=container - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "container.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "container.mak" CFG="container - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "container - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "container - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "container - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\container"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/container/libcontainer.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\container\*.lib ..\..\..\..\..\lib\windows\container\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "container - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\container\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\container\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\container\debug\libcontainer.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\container\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\*.lib ..\..\..\..\..\lib\windows\container\lib\debug\*.a ECHO Copying Debug info. XCOPY /Y ..\..\..\..\obj\windows\intern\container\debug\vc60.* ..\..\..\..\..\lib\windows\container\lib\debug\ ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "container - Win32 Release"
-# Name "container - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\CTR_List.cpp
-
-!IF "$(CFG)" == "container - Win32 Release"
-
-# ADD CPP /I "../extern" /I "../../"
-
-!ELSEIF "$(CFG)" == "container - Win32 Debug"
-
-# ADD CPP /I "../../"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\CTR_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_TaggedIndex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_TaggedSetOps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CTR_UHeap.h
-# End Source File
-# End Target
-# End Project
diff --git a/intern/container/make/msvc_6_0/container.dsw b/intern/container/make/msvc_6_0/container.dsw deleted file mode 100644 index ed9604641fb..00000000000 --- a/intern/container/make/msvc_6_0/container.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "container"=.\container.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/container/make/msvc_7_0/container.sln b/intern/container/make/msvc_7_0/container.sln deleted file mode 100644 index 16ce8e35563..00000000000 --- a/intern/container/make/msvc_7_0/container.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "container", "container.vcproj", "{E9E5B187-2E50-4DD7-9577-327FE6C9E6B0}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {E9E5B187-2E50-4DD7-9577-327FE6C9E6B0}.Debug.ActiveCfg = Debug|Win32 - {E9E5B187-2E50-4DD7-9577-327FE6C9E6B0}.Debug.Build.0 = Debug|Win32 - {E9E5B187-2E50-4DD7-9577-327FE6C9E6B0}.Release.ActiveCfg = Release|Win32 - {E9E5B187-2E50-4DD7-9577-327FE6C9E6B0}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/container/make/msvc_7_0/container.vcproj b/intern/container/make/msvc_7_0/container.vcproj deleted file mode 100644 index 2aefffb6a60..00000000000 --- a/intern/container/make/msvc_7_0/container.vcproj +++ /dev/null @@ -1,292 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="container" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\container.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\" - WarningLevel="2" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libcontainer.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying CTR files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\debug\container.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libcontainer.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying CTR files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\container.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libcontainer.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying CTR files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\container.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\container\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libcontainer.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying CTR files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\container\include MKDIR ..\..\..\..\..\build\msvc_7\intern\container\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\container\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\CTR_List.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../extern,../../;$(NoInherit)" - CompileAs="0"/> - </FileConfiguration> - <FileConfiguration - Name="Blender Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../;$(NoInherit)" - CompileAs="0"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../extern,../../;$(NoInherit)" - CompileAs="0"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../;$(NoInherit)" - CompileAs="0"/> - </FileConfiguration> - </File> - </Filter> - <File - RelativePath="..\..\CTR_List.h"> - </File> - <File - RelativePath="..\..\CTR_Map.h"> - </File> - <File - RelativePath="..\..\CTR_TaggedIndex.h"> - </File> - <File - RelativePath="..\..\CTR_TaggedSetOps.h"> - </File> - <File - RelativePath="..\..\CTR_UHeap.h"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/container/make/msvc_9_0/container.vcproj b/intern/container/make/msvc_9_0/container.vcproj deleted file mode 100644 index 76bc56f413f..00000000000 --- a/intern/container/make/msvc_9_0/container.vcproj +++ /dev/null @@ -1,388 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_container"
- ProjectGUID="{51A348C1-8684-4D67-B980-97B1FC74159B}"
- RootNamespace="container"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\container"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\container"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\container\container.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\container\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\container\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\container\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libcontainer.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying CTR files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\container\include MKDIR ..\..\..\..\..\build\msvc_9\intern\container\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\container\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\container\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\container\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\container\debug\container.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\container\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\container\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\container\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libcontainer.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying CTR files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\container\include MKDIR ..\..\..\..\..\build\msvc_9\intern\container\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\container\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\container\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\container\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\container\mtdll\container.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\container\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\container\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\container\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libcontainer.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying CTR files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\container\include MKDIR ..\..\..\..\..\build\msvc_9\intern\container\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\container\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug\container.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\container\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libcontainer.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying CTR files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\container\include MKDIR ..\..\..\..\..\build\msvc_9\intern\container\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\container\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\CTR_List.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../extern,../../;$(NoInherit)"
- CompileAs="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../;$(NoInherit)"
- CompileAs="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../extern,../../;$(NoInherit)"
- CompileAs="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../;$(NoInherit)"
- CompileAs="0"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath="..\..\CTR_List.h"
- >
- </File>
- <File
- RelativePath="..\..\CTR_Map.h"
- >
- </File>
- <File
- RelativePath="..\..\CTR_TaggedIndex.h"
- >
- </File>
- <File
- RelativePath="..\..\CTR_TaggedSetOps.h"
- >
- </File>
- <File
- RelativePath="..\..\CTR_UHeap.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index 77ab6249e7f..b726a8cd6a1 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -24,13 +24,36 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../container ../memutil ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/LOD_EdgeCollapser.cpp + intern/LOD_ExternNormalEditor.cpp + intern/LOD_FaceNormalEditor.cpp + intern/LOD_ManMesh2.cpp + intern/LOD_MeshPrimitives.cpp + intern/LOD_QSDecimator.cpp + intern/LOD_QuadricEditor.cpp + intern/LOD_decimation.cpp -BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}") + extern/LOD_decimation.h + intern/LOD_DecimationClass.h + intern/LOD_EdgeCollapser.h + intern/LOD_ExternBufferEditor.h + intern/LOD_ExternNormalEditor.h + intern/LOD_FaceNormalEditor.h + intern/LOD_ManMesh2.h + intern/LOD_MeshBounds.h + intern/LOD_MeshException.h + intern/LOD_MeshPrimitives.h + intern/LOD_QSDecimator.h + intern/LOD_Quadric.h + intern/LOD_QuadricEditor.h +) + +blender_add_lib(bf_intern_decimate "${SRC}" "${INC}") diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile deleted file mode 100644 index 7ff87fa018b..00000000000 --- a/intern/decimation/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# decimation main makefile. -# - -include nan_definitions.mk - -LIBNAME = decimation -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_DECIMATION) ] || mkdir $(NAN_DECIMATION) - @[ -d $(NAN_DECIMATION)/include ] || mkdir $(NAN_DECIMATION)/include - @[ -d $(NAN_DECIMATION)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_DECIMATION)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libdecimation.a $(NAN_DECIMATION)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_DECIMATION)/include/ - diff --git a/intern/decimation/intern/Makefile b/intern/decimation/intern/Makefile deleted file mode 100644 index 49720b2d975..00000000000 --- a/intern/decimation/intern/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# decimation intern Makefile -# - -LIBNAME = decimation -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(NAN_LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include -CPPFLAGS += -I$(NAN_CONTAINER)/include - - diff --git a/intern/decimation/make/msvc_6_0/decimation.dsp b/intern/decimation/make/msvc_6_0/decimation.dsp deleted file mode 100644 index 40b65a032db..00000000000 --- a/intern/decimation/make/msvc_6_0/decimation.dsp +++ /dev/null @@ -1,186 +0,0 @@ -# Microsoft Developer Studio Project File - Name="decimation" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=decimation - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "decimation.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "decimation.mak" CFG="decimation - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "decimation - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "decimation - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "decimation - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\libdecimation.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\*.lib ..\..\..\..\..\lib\windows\decimation\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "decimation - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\decimation\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\container\include\\" /I "..\..\..\..\..\lib\windows\memutil\include\\" /I "..\..\..\..\..\lib\windows\moto\include\\" /I"..\..\..\moto\include" /I"..\..\..\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\decimation\debug\libdecimation.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\decimation\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\*.lib ..\..\..\..\..\lib\windows\decimation\lib\debug\*.a ECHO Copying Debug info. XCOPY /Y ..\..\..\..\obj\windows\intern\decimation\debug\vc60.* ..\..\..\..\..\lib\windows\decimation\lib\debug\ ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "decimation - Win32 Release"
-# Name "decimation - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_decimation.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_DecimationClass.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_EdgeCollapser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_EdgeCollapser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternBufferEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternNormalEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ExternNormalEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_FaceNormalEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_FaceNormalEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ManMesh2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_ManMesh2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshBounds.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshPrimitives.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_MeshPrimitives.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QSDecimator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QSDecimator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_Quadric.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QuadricEditor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\LOD_QuadricEditor.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\LOD_decimation.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/decimation/make/msvc_6_0/decimation.dsw b/intern/decimation/make/msvc_6_0/decimation.dsw deleted file mode 100644 index d46268c2545..00000000000 --- a/intern/decimation/make/msvc_6_0/decimation.dsw +++ /dev/null @@ -1,33 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "decimation"=.\decimation.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
diff --git a/intern/decimation/make/msvc_7_0/decimation.sln b/intern/decimation/make/msvc_7_0/decimation.sln deleted file mode 100644 index 8760ff74f8a..00000000000 --- a/intern/decimation/make/msvc_7_0/decimation.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decimation", "decimation.vcproj", "{95ED18F3-8A76-4DB9-BDAC-12C7592EFE44}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {95ED18F3-8A76-4DB9-BDAC-12C7592EFE44}.Debug.ActiveCfg = Debug|Win32 - {95ED18F3-8A76-4DB9-BDAC-12C7592EFE44}.Debug.Build.0 = Debug|Win32 - {95ED18F3-8A76-4DB9-BDAC-12C7592EFE44}.Release.ActiveCfg = Release|Win32 - {95ED18F3-8A76-4DB9-BDAC-12C7592EFE44}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/decimation/make/msvc_7_0/decimation.vcproj b/intern/decimation/make/msvc_7_0/decimation.vcproj deleted file mode 100644 index 41bd355db5d..00000000000 --- a/intern/decimation/make/msvc_7_0/decimation.vcproj +++ /dev/null @@ -1,321 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="decimation" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\decimation\debug\decimation.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\decimation\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\decimation\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\decimation\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libdecimation.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying LOD files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_7\intern\decimation\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\decimation\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\decimation" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\decimation" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\decimation\decimation.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\decimation\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\decimation\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\decimation\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libdecimation.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying LOD files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_7\intern\decimation\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\decimation\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\decimation.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libdecimation.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying LOD files library to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_7\intern\decimation\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\decimation\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\container\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug\decimation.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\decimation\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libdecimation.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying LOD files library (debug target) to lib tree" - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_7\intern\decimation\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\decimation\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\LOD_decimation.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_DecimationClass.h"> - </File> - <File - RelativePath="..\..\intern\LOD_EdgeCollapser.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_EdgeCollapser.h"> - </File> - <File - RelativePath="..\..\intern\LOD_ExternBufferEditor.h"> - </File> - <File - RelativePath="..\..\intern\LOD_ExternNormalEditor.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_ExternNormalEditor.h"> - </File> - <File - RelativePath="..\..\intern\LOD_FaceNormalEditor.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_FaceNormalEditor.h"> - </File> - <File - RelativePath="..\..\intern\LOD_ManMesh2.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_ManMesh2.h"> - </File> - <File - RelativePath="..\..\intern\LOD_MeshBounds.h"> - </File> - <File - RelativePath="..\..\intern\LOD_MeshException.h"> - </File> - <File - RelativePath="..\..\intern\LOD_MeshPrimitives.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_MeshPrimitives.h"> - </File> - <File - RelativePath="..\..\intern\LOD_QSDecimator.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_QSDecimator.h"> - </File> - <File - RelativePath="..\..\intern\LOD_Quadric.h"> - </File> - <File - RelativePath="..\..\intern\LOD_QuadricEditor.cpp"> - </File> - <File - RelativePath="..\..\intern\LOD_QuadricEditor.h"> - </File> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\extern\LOD_decimation.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/decimation/make/msvc_9_0/decimation.vcproj b/intern/decimation/make/msvc_9_0/decimation.vcproj deleted file mode 100644 index a75332857ad..00000000000 --- a/intern/decimation/make/msvc_9_0/decimation.vcproj +++ /dev/null @@ -1,424 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_decimation"
- ProjectGUID="{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}"
- RootNamespace="decimation"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\decimation\debug\decimation.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\decimation\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\decimation\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\decimation\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libdecimation.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying LOD files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_9\intern\decimation\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\decimation\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\decimation"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\decimation"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\decimation\decimation.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\decimation\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\decimation\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\decimation\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libdecimation.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying LOD files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_9\intern\decimation\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\decimation\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\decimation.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libdecimation.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying LOD files library to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_9\intern\decimation\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\decimation\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\container\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug\decimation.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\decimation\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libdecimation.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying LOD files library (debug target) to lib tree"
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\decimation\include MKDIR ..\..\..\..\..\build\msvc_9\intern\decimation\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\decimation\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\LOD_decimation.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_DecimationClass.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_EdgeCollapser.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_EdgeCollapser.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_ExternBufferEditor.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_ExternNormalEditor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_ExternNormalEditor.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_FaceNormalEditor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_FaceNormalEditor.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_ManMesh2.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_ManMesh2.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_MeshBounds.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_MeshException.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_MeshPrimitives.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_MeshPrimitives.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_QSDecimator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_QSDecimator.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_Quadric.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_QuadricEditor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LOD_QuadricEditor.h"
- >
- </File>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\extern\LOD_decimation.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 57fb6180adb..dd23e854a25 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,17 +24,75 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} extern) +set(INC + extern + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} +) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/attributes.cpp + intern/controlparticles.cpp + intern/elbeem.cpp + intern/elbeem_control.cpp + intern/isosurface.cpp + intern/mvmcoords.cpp + intern/ntl_blenderdumper.cpp + intern/ntl_bsptree.cpp + intern/ntl_geometrymodel.cpp + intern/ntl_geometryobject.cpp + intern/ntl_lighting.cpp + intern/ntl_ray.cpp + intern/ntl_world.cpp + intern/parametrizer.cpp + intern/particletracer.cpp + intern/simulation_object.cpp + intern/solver_adap.cpp + intern/solver_control.cpp + intern/solver_init.cpp + intern/solver_interface.cpp + intern/solver_main.cpp + intern/solver_util.cpp + intern/utilities.cpp -ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1) -IF(WINDOWS) - ADD_DEFINITIONS(-DUSE_MSVC6FIXES) -ENDIF(WINDOWS) + extern/LBM_fluidsim.h + extern/elbeem.h + intern/attributes.h + intern/controlparticles.h + intern/elbeem_control.h + intern/isosurface.h + intern/loop_tools.h + intern/mcubes_tables.h + intern/mvmcoords.h + intern/ntl_blenderdumper.h + intern/ntl_bsptree.h + intern/ntl_geometryclass.h + intern/ntl_geometrymodel.h + intern/ntl_geometryobject.h + intern/ntl_geometryshader.h + intern/ntl_lighting.h + intern/ntl_matrices.h + intern/ntl_ray.h + intern/ntl_vector3dim.h + intern/ntl_world.h + intern/paraloopend.h + intern/parametrizer.h + intern/particletracer.h + intern/simulation_object.h + intern/solver_class.h + intern/solver_control.h + intern/solver_interface.h + intern/solver_relax.h + intern/utilities.h +) -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +add_definitions(-DNOGUI -DELBEEM_BLENDER=1) +if(WINDOWS) + add_definitions(-DUSE_MSVC6FIXES) +endif() -BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}") +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() + +blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}") diff --git a/intern/elbeem/Makefile b/intern/elbeem/Makefile deleted file mode 100644 index e7e8a8baa64..00000000000 --- a/intern/elbeem/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# elbeem main makefile. -# - -include nan_definitions.mk - -unexport NAN_QUIET - -LIBNAME = elbeem -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not ready yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_ELBEEM) ] || mkdir $(NAN_ELBEEM) - @[ -d $(NAN_ELBEEM)/include ] || mkdir $(NAN_ELBEEM)/include - @[ -d $(NAN_ELBEEM)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ELBEEM)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libelbeem.a $(NAN_ELBEEM)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_ELBEEM)/include/ - diff --git a/intern/elbeem/intern/Makefile b/intern/elbeem/intern/Makefile deleted file mode 100644 index ec92a5dd5a8..00000000000 --- a/intern/elbeem/intern/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# elbeem intern Makefile -# - -LIBNAME = elbeem -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -unexport NAN_QUIET - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -ifeq ($(WITH_BF_OPENMP),true) - CPPFLAGS += -DPARALLEL -endif - -CPPFLAGS += -DNOGUI -DELBEEM_BLENDER -CPPFLAGS += -I. -CPPFLAGS += -I../extern -CPPFLAGS += $(NAN_SDLCFLAGS) -CPPFLAGS += -I$(NAN_PNG)/include -CPPFLAGS += -I$(NAN_PNG)/include/libpng - -# zlib -ifeq ($(OS),$(findstring $(OS), "solaris windows")) - CPPFLAGS += -I$(NAN_ZLIB)/include -endif diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index fee011a70ae..3d61697bbc6 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -1001,7 +1001,7 @@ bool LbmFsgrSolver::initializeSolverMemory() preinitGrids(); for(int lev=0; lev<=mMaxRefine; lev++) { FSGR_FORIJK_BOUNDS(lev) { - RFLAG(lev,i,j,k,0) = RFLAG(lev,i,j,k,0) = 0; // reset for changeFlag usage + RFLAG(lev,i,j,k,0) = 0, RFLAG(lev,i,j,k,0) = 0; // reset for changeFlag usage if(!mAllfluid) { initEmptyCell(lev, i,j,k, CFEmpty, -1.0, -1.0); } else { diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index a5f63e696a6..b0a58b13367 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -12,6 +12,9 @@ /* debugging outputs , debug level 0 (off) to 10 (max) */ #ifdef ELBEEM_PLUGIN +#ifdef DEBUG +#undef DEBUG +#endif #define DEBUG 0 #else // ELBEEM_PLUGIN #define DEBUG 10 diff --git a/intern/elbeem/make/msvc_6_0/elbeem.dsp b/intern/elbeem/make/msvc_6_0/elbeem.dsp deleted file mode 100644 index 652687ca82b..00000000000 --- a/intern/elbeem/make/msvc_6_0/elbeem.dsp +++ /dev/null @@ -1,290 +0,0 @@ -# Microsoft Developer Studio Project File - Name="elbeem" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=elbeem - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "elbeem.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "elbeem.mak" CFG="elbeem - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "elbeem - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "elbeem - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "elbeem - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\blender_elbeem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib ... xcopy /Y .\release\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\*.*
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "elbeem - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../lib/windows/sdl/include" /I "../../../../../lib/windows/zlib/include" /I "../../../../../lib/windows/png/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "NOGUI" /D "ELBEEM_BLENDER" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\blender_elbeem.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy to lib ... xcopy /Y .\debug\blender_elbeem.lib ..\..\..\..\..\lib\windows\elbeem\lib\debug\*.*
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "elbeem - Win32 Release"
-# Name "elbeem - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\attributes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\elbeem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\isosurface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_blenderdumper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_bsptree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometrymodel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryobject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lighting.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_ray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_world.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\parametrizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\particletracer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\simulation_object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_adap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_init.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_interface.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_util.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\utilities.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\intern\attributes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\isosurface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\mcubes_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_blenderdumper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_bsptree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryclass.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometrymodel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_geometryshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lighting.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_lightobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_material.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_matrices.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_ray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_renderglobals.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_rndstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_scene.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_vector3dim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\ntl_world.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\parametrizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\particletracer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\simulation_object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_class.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_dimenions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_interface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\solver_relax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\utilities.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/elbeem/make/msvc_7_0/elbeem.vcproj b/intern/elbeem/make/msvc_7_0/elbeem.vcproj deleted file mode 100644 index 958d74f8fa0..00000000000 --- a/intern/elbeem/make/msvc_7_0/elbeem.vcproj +++ /dev/null @@ -1,391 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="elbeem" - ProjectGUID="{A90C4918-4B21-4277-93BD-AF65F30951D9}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\elbeem\debug\elbeem.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\elbeem\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\elbeem\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\elbeem\debug\" - BrowseInformation="1" - WarningLevel="2" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libelbeem.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying ELBEEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\elbeem\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\elbeem\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1" - StringPooling="TRUE" - MinimalRebuild="FALSE" - RuntimeLibrary="0" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\elbeem\elbeem.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\elbeem\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\elbeem\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\elbeem\" - WarningLevel="4" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libelbeem.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying ELBEEM files library (release target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\elbeem\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\elbeem\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug\elbeem.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\debug\" - BrowseInformation="1" - WarningLevel="2" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libelbeem.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying ELBEEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\elbeem\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\elbeem\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1" - StringPooling="TRUE" - MinimalRebuild="FALSE" - RuntimeLibrary="2" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\elbeem.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\elbeem\mtdll\" - WarningLevel="2" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libelbeem.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying ELBEEM files library (release target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_7\intern\elbeem\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\elbeem\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> - <File - RelativePath="..\..\intern\attributes.cpp"> - </File> - <File - RelativePath="..\..\intern\controlparticles.cpp"> - </File> - <File - RelativePath="..\..\intern\elbeem.cpp"> - </File> - <File - RelativePath="..\..\intern\elbeem_control.cpp"> - </File> - <File - RelativePath="..\..\intern\isosurface.cpp"> - </File> - <File - RelativePath="..\..\intern\mvmcoords.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_blenderdumper.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_bsptree.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_geometrymodel.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_geometryobject.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_lighting.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_ray.cpp"> - </File> - <File - RelativePath="..\..\intern\ntl_world.cpp"> - </File> - <File - RelativePath="..\..\intern\parametrizer.cpp"> - </File> - <File - RelativePath="..\..\intern\particletracer.cpp"> - </File> - <File - RelativePath="..\..\intern\simulation_object.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_adap.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_control.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_init.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_interface.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_main.cpp"> - </File> - <File - RelativePath="..\..\intern\solver_util.cpp"> - </File> - <File - RelativePath="..\..\intern\utilities.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> - <File - RelativePath="..\..\intern\attributes.h"> - </File> - <File - RelativePath="..\..\intern\controlparticles.h"> - </File> - <File - RelativePath="..\..\extern\elbeem.h"> - </File> - <File - RelativePath="..\..\intern\elbeem_control.h"> - </File> - <File - RelativePath="..\..\intern\isosurface.h"> - </File> - <File - RelativePath="..\..\intern\mcubes_tables.h"> - </File> - <File - RelativePath="..\..\intern\mvmcoords.h"> - </File> - <File - RelativePath="..\..\intern\ntl_blenderdumper.h"> - </File> - <File - RelativePath="..\..\intern\ntl_bsptree.h"> - </File> - <File - RelativePath="..\..\intern\ntl_geometryclass.h"> - </File> - <File - RelativePath="..\..\intern\ntl_geometrymodel.h"> - </File> - <File - RelativePath="..\..\intern\ntl_geometryobject.h"> - </File> - <File - RelativePath="..\..\intern\ntl_geometryshader.h"> - </File> - <File - RelativePath="..\..\intern\ntl_lighting.h"> - </File> - <File - RelativePath="..\..\intern\ntl_matrices.h"> - </File> - <File - RelativePath="..\..\intern\ntl_ray.h"> - </File> - <File - RelativePath="..\..\intern\ntl_vector3dim.h"> - </File> - <File - RelativePath="..\..\intern\ntl_world.h"> - </File> - <File - RelativePath="..\..\intern\parametrizer.h"> - </File> - <File - RelativePath="..\..\intern\particletracer.h"> - </File> - <File - RelativePath="..\..\intern\simulation_object.h"> - </File> - <File - RelativePath="..\..\intern\solver_class.h"> - </File> - <File - RelativePath="..\..\intern\solver_control.h"> - </File> - <File - RelativePath="..\..\intern\solver_interface.h"> - </File> - <File - RelativePath="..\..\intern\solver_relax.h"> - </File> - <File - RelativePath="..\..\intern\utilities.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/elbeem/make/msvc_9_0/elbeem.vcproj b/intern/elbeem/make/msvc_9_0/elbeem.vcproj deleted file mode 100644 index 2369a76fff0..00000000000 --- a/intern/elbeem/make/msvc_9_0/elbeem.vcproj +++ /dev/null @@ -1,525 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_elbeem"
- ProjectGUID="{A90C4918-4B21-4277-93BD-AF65F30951D9}"
- RootNamespace="elbeem"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\elbeem\debug\elbeem.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\elbeem\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\elbeem\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\elbeem\debug\"
- BrowseInformation="1"
- WarningLevel="2"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libelbeem.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying ELBEEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\elbeem\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\elbeem\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="0"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\elbeem\elbeem.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\elbeem\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\elbeem\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\elbeem\"
- WarningLevel="4"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libelbeem.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying ELBEEM files library (release target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\elbeem\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\elbeem\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug\elbeem.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\debug\"
- BrowseInformation="1"
- WarningLevel="2"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libelbeem.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying ELBEEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\elbeem\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\elbeem\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
- StringPooling="true"
- MinimalRebuild="false"
- RuntimeLibrary="2"
- BufferSecurityCheck="true"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\elbeem.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\elbeem\mtdll\"
- WarningLevel="2"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libelbeem.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying ELBEEM files library (release target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\elbeem\include MKDIR ..\..\..\..\..\build\msvc_9\intern\elbeem\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\elbeem\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\intern\attributes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\controlparticles.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\elbeem.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\elbeem_control.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\isosurface.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\mvmcoords.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_blenderdumper.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_bsptree.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometrymodel.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometryobject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_lighting.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_ray.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_world.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\parametrizer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\particletracer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\simulation_object.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_adap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_control.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_init.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_interface.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_main.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_util.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\utilities.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\intern\attributes.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\controlparticles.h"
- >
- </File>
- <File
- RelativePath="..\..\extern\elbeem.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\elbeem_control.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\isosurface.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\mcubes_tables.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\mvmcoords.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_blenderdumper.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_bsptree.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometryclass.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometrymodel.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometryobject.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_geometryshader.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_lighting.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_matrices.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_ray.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_vector3dim.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\ntl_world.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\parametrizer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\particletracer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\simulation_object.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_class.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_control.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_interface.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\solver_relax.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\utilities.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 559d160cba2..b77236acf41 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../string ../../extern/glew/include @@ -32,63 +32,130 @@ SET(INC ../../source/blender/makesdna ) -SET(SRC - ./intern/GHOST_Buttons.cpp - ./intern/GHOST_CallbackEventConsumer.cpp - ./intern/GHOST_C-api.cpp - ./intern/GHOST_DisplayManager.cpp - ./intern/GHOST_EventManager.cpp - ./intern/GHOST_EventPrinter.cpp - ./intern/GHOST_ISystem.cpp - ./intern/GHOST_ModifierKeys.cpp - ./intern/GHOST_NDOFManager.cpp - ./intern/GHOST_Path-api.cpp - ./intern/GHOST_Rect.cpp - ./intern/GHOST_System.cpp - ./intern/GHOST_TimerManager.cpp - ./intern/GHOST_Window.cpp - ./intern/GHOST_WindowManager.cpp +set(SRC + intern/GHOST_Buttons.cpp + intern/GHOST_CallbackEventConsumer.cpp + intern/GHOST_C-api.cpp + intern/GHOST_Path-api.cpp + intern/GHOST_DisplayManager.cpp + intern/GHOST_EventManager.cpp + intern/GHOST_EventPrinter.cpp + intern/GHOST_ISystem.cpp + intern/GHOST_ISystemPaths.cpp + intern/GHOST_ModifierKeys.cpp + intern/GHOST_NDOFManager.cpp + intern/GHOST_Path-api.cpp + intern/GHOST_Rect.cpp + intern/GHOST_System.cpp + intern/GHOST_TimerManager.cpp + intern/GHOST_Window.cpp + intern/GHOST_WindowManager.cpp + + GHOST_C-api.h + GHOST_IEvent.h + GHOST_IEventConsumer.h + GHOST_ISystem.h + GHOST_ISystemPaths.h + GHOST_ITimerTask.h + GHOST_IWindow.h + GHOST_Path-api.h + GHOST_Rect.h + GHOST_Types.h + intern/GHOST_Buttons.h + intern/GHOST_CallbackEventConsumer.h + intern/GHOST_Debug.h + intern/GHOST_DisplayManager.h + intern/GHOST_Event.h + intern/GHOST_EventButton.h + intern/GHOST_EventCursor.h + intern/GHOST_EventDragnDrop.h + intern/GHOST_EventKey.h + intern/GHOST_EventManager.h + intern/GHOST_EventNDOF.h + intern/GHOST_EventPrinter.h + intern/GHOST_EventString.h + intern/GHOST_EventTrackpad.h + intern/GHOST_EventWheel.h + intern/GHOST_ModifierKeys.h + intern/GHOST_NDOFManager.h + intern/GHOST_System.h + intern/GHOST_SystemPaths.h + intern/GHOST_TimerManager.h + intern/GHOST_TimerTask.h + intern/GHOST_Window.h + intern/GHOST_WindowManager.h ) -IF(APPLE) - IF(WITH_COCOA) - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerCocoa.mm - ./intern/GHOST_SystemCocoa.mm - ./intern/GHOST_WindowCocoa.mm +if(APPLE) + if(WITH_COCOA) + list(APPEND SRC + intern/GHOST_DisplayManagerCocoa.mm + intern/GHOST_SystemCocoa.mm + intern/GHOST_SystemPathsCocoa.mm + intern/GHOST_WindowCocoa.mm + + intern/GHOST_DisplayManagerCocoa.h + intern/GHOST_SystemCocoa.h + intern/GHOST_SystemPathsCocoa.h + intern/GHOST_WindowCocoa.h ) - ELSE(WITH_COCOA) - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerCarbon.cpp - ./intern/GHOST_SystemCarbon.cpp - ./intern/GHOST_WindowCarbon.cpp + else() + list(APPEND SRC + intern/GHOST_DisplayManagerCarbon.cpp + intern/GHOST_SystemCarbon.cpp + intern/GHOST_SystemPathsCarbon.cpp + intern/GHOST_WindowCarbon.cpp + + intern/GHOST_DisplayManagerCarbon.h + intern/GHOST_SystemCarbon.h + intern/GHOST_SystemPathsCarbon.h + intern/GHOST_WindowCarbon.h ) - ENDIF(WITH_COCOA) - - IF(WITH_QUICKTIME) - ADD_DEFINITIONS(-DWITH_QUICKTIME) - ENDIF(WITH_QUICKTIME) -ELSEIF(WIN32) - LIST(APPEND INC ${WINTAB_INC}) - - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerWin32.cpp - ./intern/GHOST_SystemWin32.cpp - ./intern/GHOST_WindowWin32.cpp - ./intern/GHOST_DropTargetWin32.cpp - ) -ELSEIF(UNIX) - LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) + endif() + + if(WITH_CODEC_QUICKTIME) + add_definitions(-DWITH_QUICKTIME) + endif() + +elseif(UNIX) + list(APPEND INC ${X11_X11_INCLUDE_PATH}) - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerX11.cpp - ./intern/GHOST_SystemX11.cpp - ./intern/GHOST_WindowX11.cpp + list(APPEND SRC + intern/GHOST_DisplayManagerX11.cpp + intern/GHOST_SystemX11.cpp + intern/GHOST_SystemPathsX11.cpp + intern/GHOST_WindowX11.cpp + + intern/GHOST_DisplayManagerX11.h + intern/GHOST_SystemX11.h + intern/GHOST_SystemPathsX11.h + intern/GHOST_WindowX11.h ) - ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}") + add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}") + +elseif(WIN32) + if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + endif() + + list(APPEND INC ${WINTAB_INC}) -ENDIF(APPLE) + list(APPEND SRC + intern/GHOST_DisplayManagerWin32.cpp + intern/GHOST_SystemWin32.cpp + intern/GHOST_SystemPathsWin32.cpp + intern/GHOST_WindowWin32.cpp + intern/GHOST_DropTargetWin32.cpp + + intern/GHOST_DisplayManagerWin32.h + intern/GHOST_DropTargetWin32.h + intern/GHOST_SystemWin32.h + intern/GHOST_SystemPathsWin32.h + intern/GHOST_WindowWin32.h + intern/GHOST_TaskbarWin32.h + ) +endif() -BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}") +blender_add_lib(bf_intern_ghost "${SRC}" "${INC}") diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 28fa72f9700..5d531ae3f75 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -46,7 +46,6 @@ extern "C" { * In the API the pointer is casted to the actual C++ class. * @param name Name of the handle to create. */ -#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name GHOST_DECLARE_HANDLE(GHOST_SystemHandle); GHOST_DECLARE_HANDLE(GHOST_TimerTaskHandle); @@ -167,7 +166,7 @@ extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle, * @return A handle to the new window ( == NULL if creation failed). */ extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle, - char* title, + const char* title, GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, @@ -525,7 +524,7 @@ extern GHOST_TSuccess GHOST_SetDrawingContextType(GHOST_WindowHandle windowhandl * @param title The title to display in the title bar. */ extern void GHOST_SetTitle(GHOST_WindowHandle windowhandle, - char* title); + const char* title); /** * Returns the title displayed in the title bar. The title diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index dae645c8943..a80407e8368 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -83,6 +83,12 @@ public: * @return The event data. */ virtual GHOST_TEventDataPtr getData() = 0; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; #endif // _GHOST_IEVENT_H_ diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h index 38ad2ec424b..4d6d063fbf5 100644 --- a/intern/ghost/GHOST_IEventConsumer.h +++ b/intern/ghost/GHOST_IEventConsumer.h @@ -62,6 +62,12 @@ public: * @return Indication as to whether the event was handled. */ virtual bool processEvent(GHOST_IEvent* event) = 0; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEventConsumer"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; #endif // _GHOST_EVENT_CONSUMER_H_ diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 47f142e4c8a..ec39248e366 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -370,25 +370,7 @@ public: */ virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0; - /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). - */ - virtual const GHOST_TUns8* getSystemDir() const = 0; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ - virtual const GHOST_TUns8* getUserDir() const = 0; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - virtual const GHOST_TUns8* getBinaryDir() const = 0; + protected: /** * Initialize the system. @@ -404,6 +386,12 @@ protected: /** The one and only system */ static GHOST_ISystem* m_system; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ISystem"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; #endif // _GHOST_ISYSTEM_H_ diff --git a/intern/ghost/GHOST_ISystemPaths.h b/intern/ghost/GHOST_ISystemPaths.h new file mode 100644 index 00000000000..9e4ad6f59c0 --- /dev/null +++ b/intern/ghost/GHOST_ISystemPaths.h @@ -0,0 +1,98 @@ +/** + * $Id: GHOST_ISystemPaths.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef _GHOST_ISYSTEMPATHS_H_ +#define _GHOST_ISYSTEMPATHS_H_ + +#include "GHOST_Types.h" + +class GHOST_ISystemPaths +{ +public: + /** + * Creates the one and only system. + * @return An indication of success. + */ + static GHOST_TSuccess create(); + + /** + * Disposes the one and only system. + * @return An indication of success. + */ + static GHOST_TSuccess dispose(); + + /** + * Returns a pointer to the one and only system (nil if it hasn't been created). + * @return A pointer to the system. + */ + static GHOST_ISystemPaths* get(); + +protected: + /** + * Constructor. + * Protected default constructor to force use of static createSystem member. + */ + GHOST_ISystemPaths() {} + + /** + * Destructor. + * Protected default constructor to force use of static dispose member. + */ + virtual ~GHOST_ISystemPaths() {} + +public: + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). + */ + virtual const GHOST_TUns8* getSystemDir() const = 0; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ + virtual const GHOST_TUns8* getUserDir() const = 0; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + virtual const GHOST_TUns8* getBinaryDir() const = 0; + + /** + * Add the file to the operating system most recently used files + */ + virtual void addToSystemRecentFiles(const char* filename) const = 0; + +private: + /** The one and only system paths*/ + static GHOST_ISystemPaths* m_systemPaths; +}; + +#endif diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index b97ae3417c6..bb80e4670fe 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -83,6 +83,12 @@ public: * @param data The timer user data. */ virtual void setUserData(const GHOST_TUserDataPtr userData) = 0; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; #endif // _GHOST_ITIMER_TASK_H_ diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 83757b17e8b..2eeee621495 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -305,6 +305,11 @@ public: */ virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }; +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IWindow"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; #endif // _GHOST_IWINDOW_H_ diff --git a/intern/ghost/GHOST_Path-api.h b/intern/ghost/GHOST_Path-api.h index c38a4e2de88..f5117a0bd7a 100644 --- a/intern/ghost/GHOST_Path-api.h +++ b/intern/ghost/GHOST_Path-api.h @@ -36,25 +36,44 @@ extern "C" { #endif +GHOST_DECLARE_HANDLE(GHOST_SystemPathsHandle); + +/** + * Creates the one and only instance of the system path access. + * @return An indication of success. + */ +extern GHOST_TSuccess GHOST_CreateSystemPaths(void); + +/** + * Disposes the one and only system. + * @return An indication of success. + */ +extern GHOST_TSuccess GHOST_DisposeSystemPaths(void); + /** * Determine the base dir in which shared resources are located. It will first try to use * "unpack and run" path, then look for properly installed path, not including versioning. * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). */ -extern const GHOST_TUns8* GHOST_getSystemDir(); +extern const GHOST_TUns8* GHOST_getSystemDir(void); /** * Determine the base dir in which user configuration is stored, not including versioning. * @return Unsigned char string pointing to user dir (eg ~). */ -extern const GHOST_TUns8* GHOST_getUserDir(); +extern const GHOST_TUns8* GHOST_getUserDir(void); /** * Determine the dir in which the binary file is found. * @return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/). */ -extern const GHOST_TUns8* GHOST_getBinaryDir(); +extern const GHOST_TUns8* GHOST_getBinaryDir(void); + +/** +* Add the file to the operating system most recently used files +*/ +extern void GHOST_addToSystemRecentFiles(const char* filename); #ifdef __cplusplus } diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index e3d056dd467..b2833eb2c28 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -185,6 +185,12 @@ public: GHOST_TInt32 m_r; /** Bottom coordinate of the rectangle */ GHOST_TInt32 m_b; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_Rect"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif }; diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index f926e72119f..af17b10bf00 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -29,6 +29,12 @@ #ifndef _GHOST_TYPES_H_ #define _GHOST_TYPES_H_ +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + +#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name + typedef char GHOST_TInt8; typedef unsigned char GHOST_TUns8; typedef short GHOST_TInt16; @@ -96,7 +102,7 @@ typedef enum { GHOST_kModifierKeyRightAlt, GHOST_kModifierKeyLeftControl, GHOST_kModifierKeyRightControl, - GHOST_kModifierKeyCommand, // APPLE only + GHOST_kModifierKeyOS, GHOST_kModifierKeyNumMasks } GHOST_TModifierKeyMask; @@ -283,7 +289,7 @@ typedef enum { GHOST_kKeyRightControl, GHOST_kKeyLeftAlt, GHOST_kKeyRightAlt, - GHOST_kKeyCommand, // Command key on Apple, Windows key(s) on Windows + GHOST_kKeyOS, // Command key on Apple, Windows key(s) on Windows GHOST_kKeyGrLess , // German PC only! GHOST_kKeyCapsLock, @@ -444,7 +450,7 @@ typedef struct { GHOST_TUns64 delta; } GHOST_TEventNDOFData; -typedef int (*GHOST_NDOFLibraryInit_fp)(); +typedef int (*GHOST_NDOFLibraryInit_fp)(void); typedef void (*GHOST_NDOFLibraryShutdown_fp)(void* deviceHandle); typedef void* (*GHOST_NDOFDeviceOpen_fp)(void* platformData); diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile deleted file mode 100644 index e983c3a9cee..00000000000 --- a/intern/ghost/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# ghost main makefile. -# - -include nan_definitions.mk - -LIBNAME = ghost -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST) - @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include - @[ -d $(NAN_GHOST)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GHOST)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libghost.a $(NAN_GHOST)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a -endif - @../tools/cpifdiff.sh *.h $(NAN_GHOST)/include/ - diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 4419513c40b..7aedc08ce96 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -11,7 +11,7 @@ if window_system == 'darwin': sources += env.Glob('intern/*.mm') -pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window', 'GHOST_DropTarget'] +pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget'] defs=['_USE_MATH_DEFINES'] if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): @@ -21,6 +21,8 @@ if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'fr sources.remove('intern' + os.sep + f + 'Carbon.cpp') except ValueError: pass + defs += ['PREFIX=\\"/usr/local/\\"'] + elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): for f in pf: try: @@ -60,4 +62,8 @@ if env['BF_GHOST_DEBUG']: incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs -env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) + +if window_system in ('win32-vc', 'win64-vc'): + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') ) +else: + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index 839d85c9617..7ac3acdb9b8 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -129,7 +129,7 @@ void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle, GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle, - char* title, + const char* title, GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, @@ -525,7 +525,7 @@ GHOST_TSuccess GHOST_SetDrawingContextType(GHOST_WindowHandle windowhandle, void GHOST_SetTitle(GHOST_WindowHandle windowhandle, - char* title) + const char* title) { GHOST_IWindow* window = (GHOST_IWindow*) windowhandle; diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index d402aed63db..927ecfc88a5 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -35,10 +35,10 @@ #define _GHOST_DEBUG_H_ #if defined(WIN32) && !defined(FREE_WINDOWS) - #ifdef _DEBUG + #ifdef DEBUG #pragma warning (disable:4786) // suppress stl-MSVC debug info warning // #define GHOST_DEBUG - #endif // _DEBUG + #endif // DEBUG #endif // WIN32 #ifdef BF_GHOST_DEBUG diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index 645a33ab8c5..697ced64a70 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -255,9 +255,8 @@ void GHOST_EventPrinter::getKeyString(GHOST_TKey key, STR_String& str) const case GHOST_kKeyRightAlt: str = "RightAlt"; break; - case GHOST_kKeyCommand: - // APPLE only! - str = "Command"; + case GHOST_kKeyOS: + str = "OS"; break; case GHOST_kKeyGrLess: // PC german! diff --git a/intern/ghost/intern/GHOST_ISystemPaths.cpp b/intern/ghost/intern/GHOST_ISystemPaths.cpp new file mode 100644 index 00000000000..b9227c33149 --- /dev/null +++ b/intern/ghost/intern/GHOST_ISystemPaths.cpp @@ -0,0 +1,104 @@ +/** + * $Id: GHOST_ISystemPaths.cpp 34106 2011-01-05 19:19:49Z gsrb3d $ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** + + * $Id: GHOST_ISystemPaths.cpp 34106 2011-01-05 19:19:49Z gsrb3d $ + * Copyright (C) 2001 NaN Technologies B.V. + * @author Maarten Gribnau + * @date May 7, 2001 + */ + +#include "GHOST_ISystemPaths.h" + +#ifdef WIN32 +# include "GHOST_SystemPathsWin32.h" +#else +# ifdef __APPLE__ +# ifdef GHOST_COCOA +# include "GHOST_SystemPathsCocoa.h" +# else +# include "GHOST_SystemPathsCarbon.h" +# endif +# else +# include "GHOST_SystemPathsX11.h" +# endif +#endif + + +GHOST_ISystemPaths* GHOST_ISystemPaths::m_systemPaths = 0; + + +GHOST_TSuccess GHOST_ISystemPaths::create() +{ + GHOST_TSuccess success; + if (!m_systemPaths) { +#ifdef WIN32 + m_systemPaths = new GHOST_SystemPathsWin32 (); +#else +# ifdef __APPLE__ +# ifdef GHOST_COCOA + m_systemPaths = new GHOST_SystemPathsCocoa (); +# else + m_systemPaths = new GHOST_SystemPathsarbon (); +# endif +# else + m_systemPaths = new GHOST_SystemPathsX11 (); +# endif +#endif + success = m_systemPaths != 0 ? GHOST_kSuccess : GHOST_kFailure; + } + else { + success = GHOST_kFailure; + } + return success; +} + +GHOST_TSuccess GHOST_ISystemPaths::dispose() +{ + GHOST_TSuccess success = GHOST_kSuccess; + if (m_systemPaths) { + delete m_systemPaths; + m_systemPaths = 0; + } + else { + success = GHOST_kFailure; + } + return success; +} + +GHOST_ISystemPaths* GHOST_ISystemPaths::get() +{ + if (!m_systemPaths) { + create(); + } + return m_systemPaths; +} + + + diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index ed884966cb3..361329532f9 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -55,7 +55,7 @@ GHOST_TKey GHOST_ModifierKeys::getModifierKeyCode(GHOST_TModifierKeyMask mask) case GHOST_kModifierKeyRightAlt: key = GHOST_kKeyRightAlt; break; case GHOST_kModifierKeyLeftControl: key = GHOST_kKeyLeftControl; break; case GHOST_kModifierKeyRightControl: key = GHOST_kKeyRightControl; break; - case GHOST_kModifierKeyCommand: key = GHOST_kKeyCommand; break; + case GHOST_kModifierKeyOS: key = GHOST_kKeyOS; break; default: // Should not happen key = GHOST_kKeyUnknown; @@ -80,8 +80,8 @@ bool GHOST_ModifierKeys::get(GHOST_TModifierKeyMask mask) const return m_LeftControl; case GHOST_kModifierKeyRightControl: return m_RightControl; - case GHOST_kModifierKeyCommand: - return m_Command; + case GHOST_kModifierKeyOS: + return m_OS; default: return false; } @@ -103,8 +103,8 @@ void GHOST_ModifierKeys::set(GHOST_TModifierKeyMask mask, bool down) m_LeftControl = down; break; case GHOST_kModifierKeyRightControl: m_RightControl = down; break; - case GHOST_kModifierKeyCommand: - m_Command = down; break; + case GHOST_kModifierKeyOS: + m_OS = down; break; default: break; } @@ -119,7 +119,7 @@ void GHOST_ModifierKeys::clear() m_RightAlt = false; m_LeftControl = false; m_RightControl = false; - m_Command = false; + m_OS = false; } @@ -131,5 +131,5 @@ bool GHOST_ModifierKeys::equals(const GHOST_ModifierKeys& keys) const (m_RightAlt == keys.m_RightAlt) && (m_LeftControl == keys.m_LeftControl) && (m_RightControl == keys.m_RightControl) && - (m_Command == keys.m_Command); + (m_OS == keys.m_OS); } diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h index e18899bc939..77d6d5757d9 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.h +++ b/intern/ghost/intern/GHOST_ModifierKeys.h @@ -96,8 +96,8 @@ struct GHOST_ModifierKeys GHOST_TUns8 m_LeftControl : 1; /** Bitfield that stores the appropriate key state. */ GHOST_TUns8 m_RightControl : 1; - /** Bitfield that stores the appropriate key state. APPLE only! */ - GHOST_TUns8 m_Command : 1; + /** Bitfield that stores the appropriate key state. */ + GHOST_TUns8 m_OS : 1; }; #endif // _GHOST_MODIFIER_KEYS_H_ diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp index b2b7c68e998..bd88fb13e60 100644 --- a/intern/ghost/intern/GHOST_Path-api.cpp +++ b/intern/ghost/intern/GHOST_Path-api.cpp @@ -28,23 +28,42 @@ */ #include "intern/GHOST_Debug.h" +#include "GHOST_Types.h" #include "GHOST_Path-api.h" -#include "GHOST_ISystem.h" +#include "GHOST_ISystemPaths.h" + +GHOST_TSuccess GHOST_CreateSystemPaths(void) +{ + return GHOST_ISystemPaths::create();; +} + +GHOST_TSuccess GHOST_DisposeSystemPaths(void) +{ + return GHOST_ISystemPaths::dispose(); +} const GHOST_TUns8* GHOST_getSystemDir() { - GHOST_ISystem* system = GHOST_ISystem::getSystem(); - return system ? system->getSystemDir() : NULL; + GHOST_ISystemPaths* systemPaths = GHOST_ISystemPaths::get(); + return systemPaths ? systemPaths->getSystemDir() : 0; } const GHOST_TUns8* GHOST_getUserDir() { - GHOST_ISystem* system = GHOST_ISystem::getSystem(); - return system ? system->getUserDir() : NULL; /* will be NULL in background mode */ + GHOST_ISystemPaths* systemPaths = GHOST_ISystemPaths::get(); + return systemPaths ? systemPaths->getUserDir() : 0; /* shouldn't be NULL */ } const GHOST_TUns8* GHOST_getBinaryDir() { - GHOST_ISystem* system = GHOST_ISystem::getSystem(); - return system ? system->getBinaryDir() : NULL; /* will be NULL in background mode */ + GHOST_ISystemPaths* systemPaths = GHOST_ISystemPaths::get(); + return systemPaths ? systemPaths->getBinaryDir() : 0; /* shouldn't be NULL */ +} + +void GHOST_addToSystemRecentFiles(const char* filename) +{ + GHOST_ISystemPaths* systemPaths = GHOST_ISystemPaths::get(); + if (systemPaths) { + systemPaths->addToSystemRecentFiles(filename); + } } diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index a18670738fe..d9b901235ca 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -297,25 +297,7 @@ public: */ virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0; - /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). - */ - virtual const GHOST_TUns8* getSystemDir() const = 0; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ - virtual const GHOST_TUns8* getUserDir() const = 0; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - virtual const GHOST_TUns8* getBinaryDir() const = 0; + protected: /** * Initialize the system. diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index ecdc03b4347..0cd11f676b0 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -553,7 +553,7 @@ GHOST_TSuccess GHOST_SystemCarbon::getModifierKeys(GHOST_ModifierKeys& keys) con { UInt32 modifiers = ::GetCurrentKeyModifiers(); - keys.set(GHOST_kModifierKeyCommand, (modifiers & cmdKey) ? true : false); + keys.set(GHOST_kModifierKeyOS, (modifiers & cmdKey) ? true : false); keys.set(GHOST_kModifierKeyLeftAlt, (modifiers & optionKey) ? true : false); keys.set(GHOST_kModifierKeyLeftShift, (modifiers & shiftKey) ? true : false); keys.set(GHOST_kModifierKeyLeftControl, (modifiers & controlKey) ? true : false); @@ -941,7 +941,7 @@ OSStatus GHOST_SystemCarbon::handleKeyEvent(EventRef event) pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & optionKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyLeftAlt) ); } if ((modifiers & cmdKey) != (m_modifierMask & cmdKey)) { - pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & cmdKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyCommand) ); + pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & cmdKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyOS) ); } m_modifierMask = modifiers; @@ -1214,39 +1214,3 @@ void GHOST_SystemCarbon::putClipboard(GHOST_TInt8 *buffer, bool selection) const CFRelease(textData); } } - - -const GHOST_TUns8* GHOST_SystemCarbon::getSystemDir() const -{ - return (GHOST_TUns8*)"/Library/Application Support"; -} - -const GHOST_TUns8* GHOST_SystemCarbon::getUserDir() const -{ - static char usrPath[256] = ""; - char* env = getenv("HOME"); - - if (env) { - strncpy(usrPath, env, 245); - usrPath[245]=0; - strcat(usrPath, "/Library/Application Support"); - return (GHOST_TUns8*) usrPath; - } - else - return NULL; -} - -const GHOST_TUns8* GHOST_SystemCarbon::getBinaryDir() const -{ - CFURLRef bundleURL; - CFStringRef pathStr; - static char path[256]; - CFBundleRef mainBundle = CFBundleGetMainBundle(); - - bundleURL = CFBundleCopyBundleURL(mainBundle); - pathStr = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle); - CFStringGetCString(pathStr, path, 255, kCFStringEncodingASCII); - CFRelease(pathStr); - CFRelease(bundleURL); - return (GHOST_TUns8*)path; -} diff --git a/intern/ghost/intern/GHOST_SystemCarbon.h b/intern/ghost/intern/GHOST_SystemCarbon.h index 723652dc872..fd5c61fd7b6 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.h +++ b/intern/ghost/intern/GHOST_SystemCarbon.h @@ -190,27 +190,6 @@ public: */ virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; - - /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). - */ - virtual const GHOST_TUns8* getSystemDir() const; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ - virtual const GHOST_TUns8* getUserDir() const; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - virtual const GHOST_TUns8* getBinaryDir() const; - protected: /** * Initializes the system. diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 3ae8ec02dda..ffc9a6bbfb7 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -214,26 +214,6 @@ public: virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). - */ - virtual const GHOST_TUns8* getSystemDir() const; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ - virtual const GHOST_TUns8* getUserDir() const; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - virtual const GHOST_TUns8* getBinaryDir() const; - - /** * Handles a window event. Called by GHOST_WindowCocoa window delegate * @param eventType The type of window event * @param window The window on which the event occurred diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b7038a30e00..bf401138cf1 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -853,7 +853,7 @@ GHOST_TSuccess GHOST_SystemCocoa::setMouseCursorPosition(GHOST_TInt32 x, GHOST_T GHOST_TSuccess GHOST_SystemCocoa::getModifierKeys(GHOST_ModifierKeys& keys) const { - keys.set(GHOST_kModifierKeyCommand, (m_modifierMask & NSCommandKeyMask) ? true : false); + keys.set(GHOST_kModifierKeyOS, (m_modifierMask & NSCommandKeyMask) ? true : false); keys.set(GHOST_kModifierKeyLeftAlt, (m_modifierMask & NSAlternateKeyMask) ? true : false); keys.set(GHOST_kModifierKeyLeftShift, (m_modifierMask & NSShiftKeyMask) ? true : false); keys.set(GHOST_kModifierKeyLeftControl, (m_modifierMask & NSControlKeyMask) ? true : false); @@ -987,6 +987,8 @@ bool GHOST_SystemCocoa::processEvents(bool waitForEvent) return true; } + m_ignoreWindowSizedMessages = false; + return anyProcessed; } @@ -1016,7 +1018,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleApplicationBecomeActiveEvent() pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & NSAlternateKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyLeftAlt) ); } if ((modifiers & NSCommandKeyMask) != (m_modifierMask & NSCommandKeyMask)) { - pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & NSCommandKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyCommand) ); + pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & NSCommandKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyOS) ); } m_modifierMask = modifiers; @@ -1054,8 +1056,12 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType, case GHOST_kEventWindowSize: if (!m_ignoreWindowSizedMessages) { + //Enforce only one resize message per event loop (coalescing all the live resize messages) window->updateDrawingContext(); pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window) ); + //Mouse up event is trapped by the resizing event loop, so send it anyway to the window manager + pushEvent(new GHOST_EventButton(getMilliSeconds(), GHOST_kEventButtonUp, window, convertButton(0))); + m_ignoreWindowSizedMessages = true; } break; default: @@ -1157,7 +1163,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType NSEnumerator *enumerator; NSImageRep *representation; - ibuf = IMB_allocImBuf (imgSize.width , imgSize.height, 32, IB_rect, 0); + ibuf = IMB_allocImBuf (imgSize.width , imgSize.height, 32, IB_rect); if (!ibuf) { [droppedImg release]; return GHOST_kFailure; @@ -1350,7 +1356,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr) if (confirmOpen == NSAlertAlternateReturn) { - filenameTextSize = [filepath lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding]; + filenameTextSize = [filepath lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; temp_buff = (char*) malloc(filenameTextSize+1); @@ -1358,7 +1364,7 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void *filepathStr) return GHOST_kFailure; } - strncpy(temp_buff, [filepath cStringUsingEncoding:NSISOLatin1StringEncoding], filenameTextSize); + strncpy(temp_buff, [filepath cStringUsingEncoding:NSUTF8StringEncoding], filenameTextSize); temp_buff[filenameTextSize] = '\0'; @@ -1692,7 +1698,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr) pushEvent( new GHOST_EventKey([event timestamp]*1000, (modifiers & NSAlternateKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyLeftAlt) ); } if ((modifiers & NSCommandKeyMask) != (m_modifierMask & NSCommandKeyMask)) { - pushEvent( new GHOST_EventKey([event timestamp]*1000, (modifiers & NSCommandKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyCommand) ); + pushEvent( new GHOST_EventKey([event timestamp]*1000, (modifiers & NSCommandKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyOS) ); } m_modifierMask = modifiers; @@ -1790,67 +1796,3 @@ void GHOST_SystemCocoa::putClipboard(GHOST_TInt8 *buffer, bool selection) const [pool drain]; } -#pragma mark Base directories retrieval - -const GHOST_TUns8* GHOST_SystemCocoa::getSystemDir() const -{ - static GHOST_TUns8 tempPath[512] = ""; - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *basePath; - NSArray *paths; - - paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSLocalDomainMask, YES); - - if ([paths count] > 0) - basePath = [paths objectAtIndex:0]; - else { - [pool drain]; - return NULL; - } - - strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]); - - [pool drain]; - return tempPath; -} - -const GHOST_TUns8* GHOST_SystemCocoa::getUserDir() const -{ - static GHOST_TUns8 tempPath[512] = ""; - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *basePath; - NSArray *paths; - - paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES); - - if ([paths count] > 0) - basePath = [paths objectAtIndex:0]; - else { - [pool drain]; - return NULL; - } - - strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]); - - [pool drain]; - return tempPath; -} - -const GHOST_TUns8* GHOST_SystemCocoa::getBinaryDir() const -{ - static GHOST_TUns8 tempPath[512] = ""; - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *basePath; - - basePath = [[NSBundle mainBundle] bundlePath]; - - if (basePath == nil) { - [pool drain]; - return NULL; - } - - strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]); - - [pool drain]; - return tempPath; -} diff --git a/intern/ghost/intern/GHOST_SystemPaths.h b/intern/ghost/intern/GHOST_SystemPaths.h new file mode 100644 index 00000000000..3739bfb3d60 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPaths.h @@ -0,0 +1,79 @@ +/** + * $Id: GHOST_SystemPaths.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef _GHOST_SYSTEMPATHS_H_ +#define _GHOST_SYSTEMPATHS_H_ + +#include "GHOST_ISystemPaths.h" + +class GHOST_SystemPaths : public GHOST_ISystemPaths +{ +protected: + /** + * Constructor. + * Protected default constructor to force use of static createSystem member. + */ + GHOST_SystemPaths(){}; + + /** + * Destructor. + * Protected default constructor to force use of static dispose member. + */ + virtual ~GHOST_SystemPaths(){}; + +public: + + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). + */ + virtual const GHOST_TUns8* getSystemDir() const = 0; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ + virtual const GHOST_TUns8* getUserDir() const = 0; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + virtual const GHOST_TUns8* getBinaryDir() const = 0; + + /** + * Add the file to the operating system most recently used files + */ + virtual void addToSystemRecentFiles(const char* filename) const = 0; + +}; + +#endif + + diff --git a/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp b/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp new file mode 100644 index 00000000000..8cdf9575afb --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp @@ -0,0 +1,83 @@ +/** + * $Id: GHOST_SystemPathsCarbon.cpp 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Damien Plisson 2010 + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <Carbon/Carbon.h> +#include <ApplicationServices/ApplicationServices.h> +#include "GHOST_SystemPathsCarbon.h" + + +/***/ + +GHOST_SystemPathsCarbon::GHOST_SystemPathsCarbon() +{ +} + +GHOST_SystemPathsCarbon::~GHOST_SystemPathsCarbon() +{ +} + +const GHOST_TUns8* GHOST_SystemPathsCarbon::getSystemDir() const +{ + return (GHOST_TUns8*)"/Library/Application Support"; +} + +const GHOST_TUns8* GHOST_SystemPathsCarbon::getUserDir() const +{ + static char usrPath[256] = ""; + char* env = getenv("HOME"); + + if (env) { + strncpy(usrPath, env, 245); + usrPath[245]=0; + strcat(usrPath, "/Library/Application Support"); + return (GHOST_TUns8*) usrPath; + } + else + return NULL; +} + +const GHOST_TUns8* GHOST_SystemPathsCarbon::getBinaryDir() const +{ + CFURLRef bundleURL; + CFStringRef pathStr; + static char path[256]; + CFBundleRef mainBundle = CFBundleGetMainBundle(); + + bundleURL = CFBundleCopyBundleURL(mainBundle); + pathStr = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle); + CFStringGetCString(pathStr, path, 255, kCFStringEncodingASCII); + CFRelease(pathStr); + CFRelease(bundleURL); + return (GHOST_TUns8*)path; +} + +void GHOST_SystemPathsCarbon::addToSystemRecentFiles(const char* filename) const +{ + /* XXXXX TODO: Implementation for Carbon if possible */ + +} diff --git a/intern/ghost/intern/GHOST_SystemPathsCarbon.h b/intern/ghost/intern/GHOST_SystemPathsCarbon.h new file mode 100644 index 00000000000..14e247e46b7 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsCarbon.h @@ -0,0 +1,87 @@ +/** + * $Id: GHOST_SystemPathsCarbon.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Damien Plisson 2010 + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef _GHOST_SYSTEM_PATHS_CARBON_H_ +#define _GHOST_SYSTEM_PATHS_CARBON_H_ + +#ifndef __APPLE__ +#error Apple OSX only! +#endif // __APPLE__ + +#include <Carbon/Carbon.h> + +#include "GHOST_SystemPaths.h" + +/** + * OSX/Carbon Implementation of GHOST_SystemPaths class. + * @see GHOST_System. + * @author Andrea Weikert + * @date Aug 1, 2010 + */ +class GHOST_SystemPathsCarbon : public GHOST_SystemPaths { +public: + /** + * Constructor. + */ + GHOST_SystemPathsCarbon(); + + /** + * Destructor. + */ + ~GHOST_SystemPathsCarbon(); + + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). + */ + virtual const GHOST_TUns8* getSystemDir() const; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ + virtual const GHOST_TUns8* getUserDir() const; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + virtual const GHOST_TUns8* getBinaryDir() const; + + /** + * Add the file to the operating system most recently used files + */ + void addToSystemRecentFiles(const char* filename) const; +}; + +#endif // _GHOST_SYSTEM_CARBON_H_ + + + diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.h b/intern/ghost/intern/GHOST_SystemPathsCocoa.h new file mode 100644 index 00000000000..6361d8d7c25 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.h @@ -0,0 +1,79 @@ +/** + * $Id: GHOST_SystemPathsCocoa.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Damien Plisson 2010 + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef _GHOST_SYSTEM_PATHS_COCOA_H_ +#define _GHOST_SYSTEM_PATHS_COCOA_H_ + +#ifndef __APPLE__ +#error Apple OSX only! +#endif // __APPLE__ + + +#include "GHOST_SystemPaths.h" + + +class GHOST_SystemPathsCocoa : public GHOST_SystemPaths { +public: + /** + * Constructor. + */ + GHOST_SystemPathsCocoa(); + + /** + * Destructor. + */ + ~GHOST_SystemPathsCocoa(); + + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). + */ + virtual const GHOST_TUns8* getSystemDir() const; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ + virtual const GHOST_TUns8* getUserDir() const; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + virtual const GHOST_TUns8* getBinaryDir() const; + + /** + * Add the file to the operating system most recently used files + */ + void addToSystemRecentFiles(const char* filename) const; +}; + +#endif // _GHOST_SYSTEM_COCOA_H_ + diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.mm b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm new file mode 100644 index 00000000000..e9ce1ea46db --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.mm @@ -0,0 +1,121 @@ +/**
+ * $Id: GHOST_SystemPathsCocoa.mm 34106 2011-01-05 19:19:49Z gsrb3d $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Damien Plisson 2010
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#import <Cocoa/Cocoa.h>
+
+/*For the currently not ported to Cocoa keyboard layout functions (64bit & 10.6 compatible)*/
+#include <Carbon/Carbon.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include "GHOST_SystemPathsCocoa.h"
+
+
+#pragma mark initialization/finalization
+
+
+GHOST_SystemPathsCocoa::GHOST_SystemPathsCocoa()
+{
+}
+
+GHOST_SystemPathsCocoa::~GHOST_SystemPathsCocoa()
+{
+}
+
+
+#pragma mark Base directories retrieval
+
+const GHOST_TUns8* GHOST_SystemPathsCocoa::getSystemDir() const
+{
+ static GHOST_TUns8 tempPath[512] = "";
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSString *basePath;
+ NSArray *paths;
+
+ paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSLocalDomainMask, YES);
+
+ if ([paths count] > 0)
+ basePath = [paths objectAtIndex:0];
+ else {
+ [pool drain];
+ return NULL;
+ }
+
+ strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
+
+ [pool drain];
+ return tempPath;
+}
+
+const GHOST_TUns8* GHOST_SystemPathsCocoa::getUserDir() const
+{
+ static GHOST_TUns8 tempPath[512] = "";
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSString *basePath;
+ NSArray *paths;
+
+ paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+
+ if ([paths count] > 0)
+ basePath = [paths objectAtIndex:0];
+ else {
+ [pool drain];
+ return NULL;
+ }
+
+ strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
+
+ [pool drain];
+ return tempPath;
+}
+
+const GHOST_TUns8* GHOST_SystemPathsCocoa::getBinaryDir() const
+{
+ static GHOST_TUns8 tempPath[512] = "";
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSString *basePath;
+
+ basePath = [[NSBundle mainBundle] bundlePath];
+
+ if (basePath == nil) {
+ [pool drain];
+ return NULL;
+ }
+
+ strcpy((char*)tempPath, [basePath cStringUsingEncoding:NSASCIIStringEncoding]);
+
+ [pool drain];
+ return tempPath;
+}
+
+void GHOST_SystemPathsCocoa::addToSystemRecentFiles(const char* filename) const
+{
+ /* XXXXX TODO: Implementation for X11 if possible */
+}
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp new file mode 100644 index 00000000000..b74ea861b71 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp @@ -0,0 +1,110 @@ +/** + * $Id: GHOST_SystemPathsWin32.cpp 34372 2011-01-17 19:39:25Z elubie $ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2011 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation + * Andrea Weikert + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include "GHOST_SystemPathsWin32.h" + +#define WIN32_LEAN_AND_MEAN +#ifdef _WIN32_IE +#undef _WIN32_IE +#endif +#define _WIN32_IE 0x0501 +#include <windows.h> +#include <shlobj.h> + +#if defined(__MINGW32__) || defined(__CYGWIN__) + +#if !defined(SHARD_PIDL) +#define SHARD_PIDL 0x00000001L +#endif + +#if !defined(SHARD_PATHA) +#define SHARD_PATHA 0x00000002L +#endif + +#if !defined(SHARD_PATHA) +#define SHARD_PATHW 0x00000003L +#endif + +#if !defined(SHARD_PATH) +#ifdef UNICODE +#define SHARD_PATH SHARD_PATHW +#else +#define SHARD_PATH SHARD_PATHA +#endif +#endif + +#endif + +GHOST_SystemPathsWin32::GHOST_SystemPathsWin32() +{ +} + +GHOST_SystemPathsWin32::~GHOST_SystemPathsWin32() +{ +} + +const GHOST_TUns8* GHOST_SystemPathsWin32::getSystemDir() const +{ + static char knownpath[MAX_PATH]; + HRESULT hResult = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL, SHGFP_TYPE_CURRENT, knownpath); + + if (hResult == S_OK) + { + return (GHOST_TUns8*)knownpath; + } + + return NULL; +} + +const GHOST_TUns8* GHOST_SystemPathsWin32::getUserDir() const +{ + static char knownpath[MAX_PATH]; + HRESULT hResult = SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, knownpath); + + if (hResult == S_OK) + { + return (GHOST_TUns8*)knownpath; + } + + return NULL; +} + +const GHOST_TUns8* GHOST_SystemPathsWin32::getBinaryDir() const +{ + static char fullname[MAX_PATH]; + if(GetModuleFileName(0, fullname, MAX_PATH)) { + return (GHOST_TUns8*)fullname; + } + + return NULL; +} + +void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char* filename) const +{ + /* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */ + SHAddToRecentDocs(SHARD_PATH,filename); +} diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h new file mode 100644 index 00000000000..8f1f8c42ea4 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h @@ -0,0 +1,86 @@ +/** + * $Id: GHOST_SystemPathsWin32.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef _GHOST_SYSTEM_PATHS_WIN32_H_ +#define _GHOST_SYSTEM_PATHS_WIN32_H_ + +#ifndef WIN32 +#error WIN32 only! +#endif // WIN32 + +#include <windows.h> + +#include "GHOST_SystemPaths.h" + + +/** + * WIN32 Implementation of GHOST_SystemPaths class. + * @see GHOST_SystemPaths. + * @author Andrea Weikert + * @date August 1, 2010 + */ +class GHOST_SystemPathsWin32 : public GHOST_SystemPaths { +public: + /** + * Constructor. + */ + GHOST_SystemPathsWin32(); + + /** + * Destructor. + */ + virtual ~GHOST_SystemPathsWin32(); + + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/). + */ + const GHOST_TUns8* getSystemDir() const; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/). + */ + const GHOST_TUns8* getUserDir() const; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + const GHOST_TUns8* getBinaryDir() const; + + /** + * Add the file to the operating system most recently used files + */ + void addToSystemRecentFiles(const char* filename) const; +}; + +#endif // _GHOST_SYSTEM_PATHS_WIN32_H_ + diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp new file mode 100644 index 00000000000..fe02d594e58 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp @@ -0,0 +1,80 @@ +/** + * $Id: GHOST_SystemPathsX11.cpp 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include "GHOST_SystemPathsX11.h" + +#include "GHOST_Debug.h" + +// For timing + +#include <sys/time.h> +#include <unistd.h> + +#include <stdio.h> // for fprintf only +#include <cstdlib> // for exit + +#ifndef PREFIX +# define PREFIX "/usr/local" +#endif + + +using namespace std; + +GHOST_SystemPathsX11::GHOST_SystemPathsX11() +{ +} + +GHOST_SystemPathsX11::~GHOST_SystemPathsX11() +{ +} + +const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const +{ + return (GHOST_TUns8*) PREFIX "/share"; +} + +const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const +{ + char* env = getenv("HOME"); + if(env) { + return (GHOST_TUns8*) env; + } else { + return NULL; + } +} + +const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const +{ + return NULL; +} + +void GHOST_SystemPathsX11::addToSystemRecentFiles(const char* filename) const +{ + /* XXXXX TODO: Implementation for X11 if possible */ + +} diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.h b/intern/ghost/intern/GHOST_SystemPathsX11.h new file mode 100644 index 00000000000..c8a73d0049b --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemPathsX11.h @@ -0,0 +1,77 @@ +/** + * $Id: GHOST_SystemPathsX11.h 34106 2011-01-05 19:19:49Z gsrb3d $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef _GHOST_SYSTEM_PATHS_X11_H_ +#define _GHOST_SYSTEM_PATHS_X11_H_ + +#include "GHOST_SystemPaths.h" +#include "../GHOST_Types.h" + + +class GHOST_SystemPathsX11 : public GHOST_SystemPaths { +public: + + /** + * Constructor + * this class should only be instanciated by GHOST_ISystem. + */ + GHOST_SystemPathsX11(); + + /** + * Destructor. + */ + virtual ~GHOST_SystemPathsX11(); + + /** + * Determine the base dir in which shared resources are located. It will first try to use + * "unpack and run" path, then look for properly installed path, not including versioning. + * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). + */ + const GHOST_TUns8* getSystemDir() const; + + /** + * Determine the base dir in which user configuration is stored, not including versioning. + * If needed, it will create the base directory. + * @return Unsigned char string pointing to user dir (eg ~/.blender/). + */ + const GHOST_TUns8* getUserDir() const; + + /** + * Determine the directory of the current binary + * @return Unsigned char string pointing to the binary dir + */ + const GHOST_TUns8* getBinaryDir() const; + + /** + * Add the file to the operating system most recently used files + */ + void addToSystemRecentFiles(const char* filename) const; +}; + +#endif + diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index dceecb53dd2..24f9e96b109 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -34,6 +34,8 @@ * @date May 7, 2001 */ +#include <iostream> + #include "GHOST_SystemWin32.h" #include "GHOST_EventDragnDrop.h" @@ -136,14 +138,16 @@ GHOST_SystemWin32::GHOST_SystemWin32() -: m_hasPerformanceCounter(false), m_freq(0), m_start(0), - m_separateLeftRight(false), - m_separateLeftRightInitialized(false) +: m_hasPerformanceCounter(false), m_freq(0), m_start(0) { m_displayManager = new GHOST_DisplayManagerWin32 (); GHOST_ASSERT(m_displayManager, "GHOST_SystemWin32::GHOST_SystemWin32(): m_displayManager==0\n"); m_displayManager->initialize(); + // Check if current keyboard layout uses AltGr and save keylayout ID for + // specialized handling if keys like VK_OEM_*. I.e. french keylayout + // generates VK_OEM_8 for their exclamation key (key left of right shift) + this->handleKeyboardChange(); // Require COM for GHOST_DropTargetWin32 created in GHOST_WindowWin32. OleInitialize(0); } @@ -287,43 +291,27 @@ GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) const { - if (m_separateLeftRight && m_separateLeftRightInitialized) { - bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0; - keys.set(GHOST_kModifierKeyLeftShift, down); - down = HIBYTE(::GetKeyState(VK_RSHIFT)) != 0; - keys.set(GHOST_kModifierKeyRightShift, down); - down = HIBYTE(::GetKeyState(VK_LMENU)) != 0; - keys.set(GHOST_kModifierKeyLeftAlt, down); - down = HIBYTE(::GetKeyState(VK_RMENU)) != 0; - keys.set(GHOST_kModifierKeyRightAlt, down); - down = HIBYTE(::GetKeyState(VK_LCONTROL)) != 0; - keys.set(GHOST_kModifierKeyLeftControl, down); - down = HIBYTE(::GetKeyState(VK_RCONTROL)) != 0; - keys.set(GHOST_kModifierKeyRightControl, down); - bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0; - bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0; - if(lwindown || rwindown) - keys.set(GHOST_kModifierKeyCommand, true); - else - keys.set(GHOST_kModifierKeyCommand, false); - } - else { - bool down = HIBYTE(::GetKeyState(VK_SHIFT)) != 0; - keys.set(GHOST_kModifierKeyLeftShift, down); - keys.set(GHOST_kModifierKeyRightShift, down); - down = HIBYTE(::GetKeyState(VK_MENU)) != 0; - keys.set(GHOST_kModifierKeyLeftAlt, down); - keys.set(GHOST_kModifierKeyRightAlt, down); - down = HIBYTE(::GetKeyState(VK_CONTROL)) != 0; - keys.set(GHOST_kModifierKeyLeftControl, down); - keys.set(GHOST_kModifierKeyRightControl, down); - bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0; - bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0; - if(lwindown || rwindown) - keys.set(GHOST_kModifierKeyCommand, true); - else - keys.set(GHOST_kModifierKeyCommand, false); - } + bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0; + keys.set(GHOST_kModifierKeyLeftShift, down); + down = HIBYTE(::GetKeyState(VK_RSHIFT)) != 0; + keys.set(GHOST_kModifierKeyRightShift, down); + + down = HIBYTE(::GetKeyState(VK_LMENU)) != 0; + keys.set(GHOST_kModifierKeyLeftAlt, down); + down = HIBYTE(::GetKeyState(VK_RMENU)) != 0; + keys.set(GHOST_kModifierKeyRightAlt, down); + + down = HIBYTE(::GetKeyState(VK_LCONTROL)) != 0; + keys.set(GHOST_kModifierKeyLeftControl, down); + down = HIBYTE(::GetKeyState(VK_RCONTROL)) != 0; + keys.set(GHOST_kModifierKeyRightControl, down); + + bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0; + bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0; + if(lwindown || rwindown) + keys.set(GHOST_kModifierKeyOS, true); + else + keys.set(GHOST_kModifierKeyOS, false); return GHOST_kSuccess; } @@ -350,6 +338,11 @@ GHOST_TSuccess GHOST_SystemWin32::getButtons(GHOST_Buttons& buttons) const GHOST_TSuccess GHOST_SystemWin32::init() { GHOST_TSuccess success = GHOST_System::init(); + + for(int i = 0; i < 255; i++) { + m_prevKeyStatus[i] = false; + m_curKeyStatus[i] = false; + } /* Disable scaling on high DPI displays on Vista */ HMODULE user32 = ::LoadLibraryA("user32.dll"); @@ -386,26 +379,132 @@ GHOST_TSuccess GHOST_SystemWin32::init() wc.hbrBackground= (HBRUSH)::GetStockObject(BLACK_BRUSH); wc.lpszMenuName = 0; wc.lpszClassName= GHOST_WindowWin32::getWindowClassName(); - + // Use RegisterClassEx for setting small icon if (::RegisterClass(&wc) == 0) { success = GHOST_kFailure; } + + // Add low-level keyboard hook for our process. + m_llKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, s_llKeyboardProc, wc.hInstance, 0); } + return success; } GHOST_TSuccess GHOST_SystemWin32::exit() { + // remove our low-level keyboard hook. + UnhookWindowsHookEx(m_llKeyboardHook); + return GHOST_System::exit(); } +void GHOST_SystemWin32::triggerKey(GHOST_IWindow *window, bool down, GHOST_TKey key) +{ + GHOST_Event *extra = new GHOST_EventKey(getSystem()->getMilliSeconds(), down ? GHOST_kEventKeyDown : GHOST_kEventKeyUp, window, key, '\0'); + ((GHOST_SystemWin32*)getSystem())->pushEvent(extra); +} +void GHOST_SystemWin32::handleModifierKeys(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam, GHOST_ModifierKeys &oldModifiers, GHOST_ModifierKeys &newModifiers) const +{ + switch(wParam) { + case VK_SHIFT: + { + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftAlt) != newModifiers.get(GHOST_kModifierKeyLeftAlt); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftAlt), GHOST_kKeyLeftAlt); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightAlt) != newModifiers.get(GHOST_kModifierKeyRightAlt); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightAlt), GHOST_kKeyRightAlt); + } + } + lchanged = oldModifiers.get(GHOST_kModifierKeyLeftControl) != newModifiers.get(GHOST_kModifierKeyLeftControl); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftControl), GHOST_kKeyLeftControl); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightControl) != newModifiers.get(GHOST_kModifierKeyRightControl); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightControl), GHOST_kKeyRightControl); + } + } + } + break; + case VK_CONTROL: + { + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftAlt) != newModifiers.get(GHOST_kModifierKeyLeftAlt); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftAlt), GHOST_kKeyLeftAlt); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightAlt) != newModifiers.get(GHOST_kModifierKeyRightAlt); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightAlt), GHOST_kKeyRightAlt); + } + } + lchanged = oldModifiers.get(GHOST_kModifierKeyLeftShift) != newModifiers.get(GHOST_kModifierKeyLeftShift); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftShift), GHOST_kKeyLeftShift); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightShift) != newModifiers.get(GHOST_kModifierKeyRightShift); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightShift), GHOST_kKeyRightShift); + } + } + } + break; + case VK_MENU: + { + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftShift) != newModifiers.get(GHOST_kModifierKeyLeftShift); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftShift), GHOST_kKeyLeftShift); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightShift) != newModifiers.get(GHOST_kModifierKeyRightShift); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightShift), GHOST_kKeyRightShift); + } + } + lchanged = oldModifiers.get(GHOST_kModifierKeyLeftControl) != newModifiers.get(GHOST_kModifierKeyLeftControl); + if(lchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyLeftControl), GHOST_kKeyLeftControl); + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightControl) != newModifiers.get(GHOST_kModifierKeyRightControl); + if (rchanged) { + ((GHOST_SystemWin32*)getSystem())->triggerKey(window, newModifiers.get(GHOST_kModifierKeyRightControl), GHOST_kKeyRightControl); + } + } + } + break; + default: + break; + } +} -GHOST_TKey GHOST_SystemWin32::convertKey(WPARAM wParam, LPARAM lParam) const +//! note: this function can be extended to include other exotic cases as they arise. +// This function was added in response to bug [#25715] +GHOST_TKey GHOST_SystemWin32::processSpecialKey(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam) const { - GHOST_TKey key; + GHOST_TKey key = GHOST_kKeyUnknown; + switch(PRIMARYLANGID(m_langId)) { + case LANG_FRENCH: + if(wParam==VK_OEM_8) key = GHOST_kKey1; // on 'normal' shift + 1 to create '!' we also get GHOST_kKey1. ASCII will be '!'. + break; + } + + return key; +} + +GHOST_TKey GHOST_SystemWin32::convertKey(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam) const +{ + GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)getSystem(); bool isExtended = (lParam&(1<<24))?true:false; + + GHOST_TKey key; + GHOST_ModifierKeys oldModifiers, newModifiers; + system->retrieveModifierKeys(oldModifiers); + system->getModifierKeys(newModifiers); + + //std::cout << wParam << " " << system->m_curKeyStatus[wParam] << " shift pressed: " << system->shiftPressed() << std::endl; if ((wParam >= '0') && (wParam <= '9')) { // VK_0 thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) @@ -431,7 +530,14 @@ GHOST_TKey GHOST_SystemWin32::convertKey(WPARAM wParam, LPARAM lParam) const case VK_PRIOR: key = GHOST_kKeyUpPage; break; case VK_NEXT: key = GHOST_kKeyDownPage; break; case VK_END: key = GHOST_kKeyEnd; break; - case VK_HOME: key = GHOST_kKeyHome; break; + case VK_HOME: + { + if(system->m_curKeyStatus[VK_NUMPAD7] && system->shiftPressed()) + key = GHOST_kKeyNumpad7; + else + key = GHOST_kKeyHome; + } + break; case VK_INSERT: key = GHOST_kKeyInsert; break; case VK_DELETE: key = GHOST_kKeyDelete; break; case VK_LEFT: key = GHOST_kKeyLeftArrow; break; @@ -469,55 +575,80 @@ GHOST_TKey GHOST_SystemWin32::convertKey(WPARAM wParam, LPARAM lParam) const case VK_QUOTE: key = GHOST_kKeyQuote; break; case VK_GR_LESS: key = GHOST_kKeyGrLess; break; - // Process these keys separately because we need to distinguish right from left modifier keys case VK_SHIFT: + { + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftShift) != newModifiers.get(GHOST_kModifierKeyLeftShift); + if(lchanged) { + key = GHOST_kKeyLeftShift; + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightShift) != newModifiers.get(GHOST_kModifierKeyRightShift); + if(rchanged) { + key = GHOST_kKeyRightShift; + } else { + key = GHOST_kKeyUnknown; + } + } + } + break; case VK_CONTROL: + { + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftControl) != newModifiers.get(GHOST_kModifierKeyLeftControl); + if(lchanged) { + key = GHOST_kKeyLeftControl; + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightControl) != newModifiers.get(GHOST_kModifierKeyRightControl); + if(rchanged) { + key = GHOST_kKeyRightControl; + } else { + key = GHOST_kKeyUnknown; + } + } + } + break; case VK_MENU: - - // Ignore these keys - case VK_NUMLOCK: - case VK_SCROLL: - case VK_CAPITAL: + { + if(m_hasAltGr && isExtended) { + // We have here an extended RAlt, which is AltGr. The keyboard driver on Windows sends before this a LControl, so + // to be able to input characters created with AltGr (normal on German, French, Finnish and other keyboards) we + // push an extra LControl up event. This ensures we don't have a 'hanging' ctrl event in Blender windowmanager + // when typing in Text editor or Console. + GHOST_Event *extra = new GHOST_EventKey(getSystem()->getMilliSeconds(), GHOST_kEventKeyUp, window, GHOST_kKeyLeftControl, '\0'); + ((GHOST_SystemWin32*)getSystem())->pushEvent(extra); + newModifiers.set(GHOST_kModifierKeyRightControl, false); + newModifiers.set(GHOST_kModifierKeyLeftControl, false); + } + bool lchanged = oldModifiers.get(GHOST_kModifierKeyLeftAlt) != newModifiers.get(GHOST_kModifierKeyLeftAlt); + if(lchanged) { + key = GHOST_kKeyLeftAlt; + } else { + bool rchanged = oldModifiers.get(GHOST_kModifierKeyRightAlt) != newModifiers.get(GHOST_kModifierKeyRightAlt); + if(rchanged) { + key = GHOST_kKeyRightAlt; + } else { + key = GHOST_kKeyUnknown; + } + } + } + break; + case VK_LWIN: + case VK_RWIN: + key = GHOST_kKeyOS; + break; + case VK_NUMLOCK: key = GHOST_kKeyNumLock; break; + case VK_SCROLL: key = GHOST_kKeyScrollLock; break; + case VK_CAPITAL: key = GHOST_kKeyCapsLock; break; + case VK_OEM_8: + key = ((GHOST_SystemWin32*)getSystem())->processSpecialKey(window, wParam, lParam); + break; default: key = GHOST_kKeyUnknown; break; } } - return key; -} - - -void GHOST_SystemWin32::processModifierKeys(GHOST_IWindow *window) -{ - GHOST_ModifierKeys oldModifiers, newModifiers; - // Retrieve old state of the modifier keys - ((GHOST_SystemWin32*)getSystem())->retrieveModifierKeys(oldModifiers); - // Retrieve current state of the modifier keys - ((GHOST_SystemWin32*)getSystem())->getModifierKeys(newModifiers); - - // Compare the old and the new - if (!newModifiers.equals(oldModifiers)) { - // Create events for the masks that changed - for (int i = 0; i < GHOST_kModifierKeyNumMasks; i++) { - if (newModifiers.get((GHOST_TModifierKeyMask)i) != oldModifiers.get((GHOST_TModifierKeyMask)i)) { - // Convert the mask to a key code - GHOST_TKey key = GHOST_ModifierKeys::getModifierKeyCode((GHOST_TModifierKeyMask)i); - bool keyDown = newModifiers.get((GHOST_TModifierKeyMask)i); - GHOST_EventKey* event; - if (key != GHOST_kKeyUnknown) { - // Create an event - event = new GHOST_EventKey(getSystem()->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key); - pushEvent(event); - } - } - } - } - - // Store new modifier keys state ((GHOST_SystemWin32*)getSystem())->storeModifierKeys(newModifiers); + return key; } - GHOST_EventButton* GHOST_SystemWin32::processButtonEvent(GHOST_TEventType type, GHOST_IWindow *window, GHOST_TButtonMask mask) { return new GHOST_EventButton (getSystem()->getMilliSeconds(), type, window, mask); @@ -594,7 +725,7 @@ GHOST_EventWheel* GHOST_SystemWin32::processWheelEvent(GHOST_IWindow *window, WP GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, bool keyDown, WPARAM wParam, LPARAM lParam) { - GHOST_TKey key = ((GHOST_SystemWin32*)getSystem())->convertKey(wParam, lParam); + GHOST_TKey key = ((GHOST_SystemWin32*)getSystem())->convertKey(window, wParam, lParam); GHOST_EventKey* event; if (key != GHOST_kKeyUnknown) { MSG keyMsg; @@ -603,9 +734,14 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, bool k /* Eat any character related messages */ if (::PeekMessage(&keyMsg, NULL, WM_CHAR, WM_SYSDEADCHAR, PM_REMOVE)) { ascii = (char) keyMsg.wParam; + } event = new GHOST_EventKey(getSystem()->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, ascii); + +#ifdef BF_GHOST_DEBUG + std::cout << ascii << std::endl; +#endif } else { event = 0; @@ -639,6 +775,52 @@ void GHOST_SystemWin32::processMinMaxInfo(MINMAXINFO * minmax) minmax->ptMinTrackSize.y=240; } +/* Note that this function gets *all* key events from the entire system (all + * threads running in this desktop session. So when getting event here, don't assume + * it's for Blender. Thus we only do status bookkeeping, so we can check + * in s_wndProc and processKeyEvent what the real keyboard status is. + * This is needed for proper handling of shift+numpad keys for instance. + */ +LRESULT CALLBACK GHOST_SystemWin32::s_llKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem()); + + bool down = false; + if(wParam==WM_KEYDOWN || wParam==WM_SYSKEYDOWN ){ + down = true; + } + + if(nCode!=HC_ACTION) + return CallNextHookEx(system->m_llKeyboardHook, nCode, wParam, lParam); + + KBDLLHOOKSTRUCT &keyb = *(PKBDLLHOOKSTRUCT)(lParam); + system->m_prevKeyStatus[keyb.vkCode] = system->m_curKeyStatus[keyb.vkCode]; + //std::cout << "ll: " << keyb.vkCode << " " << down << " ||| "; + if(keyb.flags) { + if((keyb.flags & LLKHF_EXTENDED) == LLKHF_EXTENDED) { + //std::cout << "extended "; + } + if((keyb.flags & LLKHF_ALTDOWN) == LLKHF_ALTDOWN) { + //std::cout << "alt "; + } + if((keyb.flags & LLKHF_INJECTED)== LLKHF_INJECTED) { + //std::cout << "injected "; + } + if((keyb.flags & LLKHF_UP) == LLKHF_UP) { + system->m_curKeyStatus[keyb.vkCode] = false; + //std::cout << "up" << std::endl; + } else { + system->m_curKeyStatus[keyb.vkCode] = true; + //std::cout << "down" << std::endl; + } + } + else { + system->m_curKeyStatus[keyb.vkCode] = true; + //std::cout << "down" << std::endl; + } + + return CallNextHookEx(system->m_llKeyboardHook, nCode, wParam, lParam); +} LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -651,89 +833,30 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, GHOST_WindowWin32* window = (GHOST_WindowWin32*)::GetWindowLong(hwnd, GWL_USERDATA); if (window) { switch (msg) { + // we need to check if new key layout has AltGr + case WM_INPUTLANGCHANGE: + system->handleKeyboardChange(); + break; //////////////////////////////////////////////////////////////////////// // Keyboard events, processed //////////////////////////////////////////////////////////////////////// case WM_KEYDOWN: - /* The WM_KEYDOWN message is posted to the window with the keyboard focus when a - * nonsystem key is pressed. A nonsystem key is a key that is pressed when the alt - * key is not pressed. - */ case WM_SYSKEYDOWN: - /* The WM_SYSKEYDOWN message is posted to the window with the keyboard focus when - * the user presses the F10 key (which activates the menu bar) or holds down the - * alt key and then presses another key. It also occurs when no window currently - * has the keyboard focus; in this case, the WM_SYSKEYDOWN message is sent to the - * active window. The window that receives the message can distinguish between these - * two contexts by checking the context code in the lKeyData parameter. - */ - switch (wParam) { - case VK_SHIFT: - case VK_CONTROL: - case VK_MENU: - case VK_LWIN: - case VK_RWIN: - if (!system->m_separateLeftRightInitialized) { - // Check whether this system supports separate left and right keys - switch (wParam) { - case VK_SHIFT: - system->m_separateLeftRight = - (HIBYTE(::GetKeyState(VK_LSHIFT)) != 0) || - (HIBYTE(::GetKeyState(VK_RSHIFT)) != 0) ? - true : false; - break; - case VK_CONTROL: - system->m_separateLeftRight = - (HIBYTE(::GetKeyState(VK_LCONTROL)) != 0) || - (HIBYTE(::GetKeyState(VK_RCONTROL)) != 0) ? - true : false; - break; - case VK_MENU: - system->m_separateLeftRight = - (HIBYTE(::GetKeyState(VK_LMENU)) != 0) || - (HIBYTE(::GetKeyState(VK_RMENU)) != 0) ? - true : false; - break; - case VK_LWIN: - case VK_RWIN: - system->m_separateLeftRight = true; - break; - } - system->m_separateLeftRightInitialized = true; - } - system->processModifierKeys(window); - // Bypass call to DefWindowProc - return 0; - default: - event = processKeyEvent(window, true, wParam, lParam); - if (!event) { - GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ") - GHOST_PRINT(msg) - GHOST_PRINT(" key ignored\n") - } - break; - } + event = processKeyEvent(window, true, wParam, lParam); + if (!event) { + GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ") + GHOST_PRINT(msg) + GHOST_PRINT(" key ignored\n") + } break; case WM_KEYUP: case WM_SYSKEYUP: - switch (wParam) { - case VK_SHIFT: - case VK_CONTROL: - case VK_MENU: - case VK_LWIN: - case VK_RWIN: - system->processModifierKeys(window); - // Bypass call to DefWindowProc - return 0; - default: - event = processKeyEvent(window, false, wParam, lParam); - if (!event) { - GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ") - GHOST_PRINT(msg) - GHOST_PRINT(" key ignored\n") - } - break; + event = processKeyEvent(window, false, wParam, lParam); + if (!event) { + GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ") + GHOST_PRINT(msg) + GHOST_PRINT(" key ignored\n") } break; @@ -751,7 +874,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * specifies a character code generated by a dead key. A dead key is a key that * generates a character, such as the umlaut (double-dot), that is combined with * another character to form a composite character. For example, the umlaut-O - * character (Ù) is generated by typing the dead key for the umlaut character, and + * character (Ö) is generated by typing the dead key for the umlaut character, and * then typing the O key. */ case WM_SYSDEADCHAR: @@ -1109,39 +1232,3 @@ void GHOST_SystemWin32::putClipboard(GHOST_TInt8 *buffer, bool selection) const return; } } - -const GHOST_TUns8* GHOST_SystemWin32::getSystemDir() const -{ - static char knownpath[MAX_PATH]; - HRESULT hResult = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL, SHGFP_TYPE_CURRENT, knownpath); - - if (hResult == S_OK) - { - return (GHOST_TUns8*)knownpath; - } - - return NULL; -} - -const GHOST_TUns8* GHOST_SystemWin32::getUserDir() const -{ - static char knownpath[MAX_PATH]; - HRESULT hResult = SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, knownpath); - - if (hResult == S_OK) - { - return (GHOST_TUns8*)knownpath; - } - - return NULL; -} - -const GHOST_TUns8* GHOST_SystemWin32::getBinaryDir() const -{ - static char fullname[MAX_PATH]; - if(GetModuleFileName(0, fullname, MAX_PATH)) { - return (GHOST_TUns8*)fullname; - } - - return NULL; -} diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 35b8debf6b4..90431494992 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -188,26 +188,6 @@ public: virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/). - */ - virtual const GHOST_TUns8* getSystemDir() const; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/). - */ - virtual const GHOST_TUns8* getUserDir() const; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - virtual const GHOST_TUns8* getBinaryDir() const; - - /** * Creates a drag'n'drop event and pushes it immediately onto the event queue. * Called by GHOST_DropTargetWin32 class. * @param eventType The type of drag'n'drop event @@ -235,11 +215,28 @@ protected: /** * Converts raw WIN32 key codes from the wndproc to GHOST keys. + * @param window-> The window for this handling * @param wParam The wParam from the wndproc * @param lParam The lParam from the wndproc * @return The GHOST key (GHOST_kKeyUnknown if no match). */ - virtual GHOST_TKey convertKey(WPARAM wParam, LPARAM lParam) const; + virtual GHOST_TKey convertKey(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam) const; + + /** + * @param window The window for this handling + * @param wParam The wParam from the wndproc + * @param lParam The lParam from the wndproc + * @param oldModifiers The old modifiers + * @param newModifiers The new modifiers + */ + virtual void handleModifierKeys(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam, GHOST_ModifierKeys &oldModifiers, GHOST_ModifierKeys &newModifiers) const; + /** + * Immediately push key event for given key + * @param window The window for this handling + * @param down Whether we send up or down event + * @param key The key to send the event for + */ + virtual void triggerKey(GHOST_IWindow *window, bool down, GHOST_TKey key); /** * Creates modifier key event(s) and updates the key data stored locally (m_modifierKeys). @@ -248,7 +245,7 @@ protected: * events generated for both keys. * @param window The window receiving the event (the active window). */ - void processModifierKeys(GHOST_IWindow *window); + //GHOST_EventKey* processModifierKeys(GHOST_IWindow *window); /** * Creates mouse button event. @@ -285,6 +282,15 @@ protected: */ static GHOST_EventKey* processKeyEvent(GHOST_IWindow *window, bool keyDown, WPARAM wParam, LPARAM lParam); + /** + * Process special keys (VK_OEM_*), to see if current key layout + * gives us anything special, like ! on french AZERTY. + * @param window The window receiving the event (the active window). + * @param wParam The wParam from the wndproc + * @param lParam The lParam from the wndproc + */ + virtual GHOST_TKey processSpecialKey(GHOST_IWindow *window, WPARAM wParam, LPARAM lParam) const; + /** * Creates a window event. * @param type The type of event to create. @@ -310,11 +316,26 @@ protected: * @param keys The new state of the modifier keys. */ inline virtual void storeModifierKeys(const GHOST_ModifierKeys& keys); + + /** + * Check current key layout for AltGr + */ + inline virtual void handleKeyboardChange(void); /** * Windows call back routine for our window class. */ static LRESULT WINAPI s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + + /** + * Low-level inspection of keyboard events + */ + static LRESULT CALLBACK s_llKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam); + + /** + * Check if any shiftkey is pressed + */ + inline virtual bool shiftPressed(void); /** The current state of the modifier keys. */ GHOST_ModifierKeys m_modifierKeys; @@ -324,11 +345,14 @@ protected: __int64 m_freq; /** High frequency timer variable. */ __int64 m_start; - /** Stores the capability of this system to distinguish left and right modifier keys. */ - bool m_separateLeftRight; - /** Stores the initialization state of the member m_leftRightDistinguishable. */ - bool m_separateLeftRightInitialized; - + /** AltGr on current keyboard layout. */ + bool m_hasAltGr; + /** language identifier. */ + WORD m_langId; + /** holding hook handle for low-level keyboard handling */ + HHOOK m_llKeyboardHook; + bool m_prevKeyStatus[255]; /* VK_* codes 0x01-0xFF, with 0xFF reserved */ + bool m_curKeyStatus[255]; /* VK_* codes 0x01-0xFF, with 0xFF reserved */ }; inline void GHOST_SystemWin32::retrieveModifierKeys(GHOST_ModifierKeys& keys) const @@ -341,5 +365,31 @@ inline void GHOST_SystemWin32::storeModifierKeys(const GHOST_ModifierKeys& keys) m_modifierKeys = keys; } +inline void GHOST_SystemWin32::handleKeyboardChange(void) +{ + HKL keylayout = GetKeyboardLayout(0); // get keylayout for current thread + int i; + SHORT s; + + // save the language identifier. + m_langId = LOWORD(keylayout); + + for(m_hasAltGr = false, i = 32; i < 256; ++i) { + s = VkKeyScanEx((char)i, keylayout); + // s == -1 means no key that translates passed char code + // high byte contains shift state. bit 2 ctrl pressed, bit 4 alt pressed + // if both are pressed, we have AltGr keycombo on keylayout + if(s!=-1 && (s & 0x600) == 0x600) { + m_hasAltGr = true; + break; + } + } +} + +inline bool GHOST_SystemWin32::shiftPressed(void) +{ + return (m_curKeyStatus[VK_SHIFT] || m_curKeyStatus[VK_RSHIFT] || m_curKeyStatus[VK_LSHIFT]); +} + #endif // _GHOST_SYSTEM_WIN32_H_ diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index b07dba7319f..5e63cc4d10f 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -68,7 +68,7 @@ #include <cstdlib> // for exit #ifndef PREFIX -# define PREFIX "/usr/local" +#error "PREFIX not defined" #endif typedef struct NDOFPlatformInfo { @@ -891,13 +891,13 @@ getModifierKeys( keys.set(GHOST_kModifierKeyRightAlt,false); } - // Super (Windows) - only one GHOST-kModifierKeyCommand, so mapping + // Super (Windows) - only one GHOST-kModifierKeyOS, so mapping // to either if ( ((m_keyboard_vector[super_l >> 3] >> (super_l & 7)) & 1) || ((m_keyboard_vector[super_r >> 3] >> (super_r & 7)) & 1) ) { - keys.set(GHOST_kModifierKeyCommand,true); + keys.set(GHOST_kModifierKeyOS,true); } else { - keys.set(GHOST_kModifierKeyCommand,false); + keys.set(GHOST_kModifierKeyOS,false); } return GHOST_kSuccess; } @@ -1106,8 +1106,8 @@ convertXKey( GXMAP(type,XK_Control_R, GHOST_kKeyRightControl); GXMAP(type,XK_Alt_L, GHOST_kKeyLeftAlt); GXMAP(type,XK_Alt_R, GHOST_kKeyRightAlt); - GXMAP(type,XK_Super_L, GHOST_kKeyCommand); - GXMAP(type,XK_Super_R, GHOST_kKeyCommand); + GXMAP(type,XK_Super_L, GHOST_kKeyOS); + GXMAP(type,XK_Super_R, GHOST_kKeyOS); GXMAP(type,XK_Insert, GHOST_kKeyInsert); GXMAP(type,XK_Delete, GHOST_kKeyDelete); @@ -1476,23 +1476,4 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const } } -const GHOST_TUns8* GHOST_SystemX11::getSystemDir() const -{ - return (GHOST_TUns8*) PREFIX "/share"; -} - -const GHOST_TUns8* GHOST_SystemX11::getUserDir() const -{ - char* env = getenv("HOME"); - if(env) { - return (GHOST_TUns8*) env; - } else { - return NULL; - } -} - -const GHOST_TUns8* GHOST_SystemX11::getBinaryDir() const -{ - return NULL; -} diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 13ad4200ab8..6a4ff1b41c7 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -227,26 +227,6 @@ public: void putClipboard(GHOST_TInt8 *buffer, bool selection) const; /** - * Determine the base dir in which shared resources are located. It will first try to use - * "unpack and run" path, then look for properly installed path, not including versioning. - * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). - */ - const GHOST_TUns8* getSystemDir() const; - - /** - * Determine the base dir in which user configuration is stored, not including versioning. - * If needed, it will create the base directory. - * @return Unsigned char string pointing to user dir (eg ~/.blender/). - */ - const GHOST_TUns8* getUserDir() const; - - /** - * Determine the directory of the current binary - * @return Unsigned char string pointing to the binary dir - */ - const GHOST_TUns8* getBinaryDir() const; - - /** * Atom used for ICCCM, WM-spec and Motif. * We only need get this atom at the start, it's relative * to the display not the window and are public for every diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h new file mode 100644 index 00000000000..26e6a80c8e8 --- /dev/null +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -0,0 +1,73 @@ +#ifndef GHOST_TASKBARWIN32_H_ +#define GHOST_TASKBARWIN32_H_ +#ifndef WIN32 +#error WIN32 only! +#endif // WIN32 + +#include <windows.h> +#include <shlobj.h> + +/* MinGW needs it */ +#ifdef FREE_WINDOWS +#ifdef WINVER +#undef WINVER +#endif +#define WINVER 0x0501 +#endif /* FREE_WINDOWS */ + +// ITaskbarList, ITaskbarList2 and ITaskbarList3 might be missing, present here in that case. +// Note, ITaskbarList3 is supported only since Windows 7, though. Check for that is done in +// GHOST_WindowWin32 +#ifndef __ITaskbarList_INTERFACE_DEFINED__ +#define __ITaskbarList_INTERFACE_DEFINED__ + extern "C" {const GUID CLSID_TaskbarList = {0x56FDF344, 0xFD6D, 0x11D0, {0x95, 0x8A, 0x00, 0x60, 0x97, 0xC9, 0xA0, 0x90} }; + const GUID IID_ITaskbarList = {0x56FDF342, 0xFD6D, 0x11D0, {0x95, 0x8A, 0x00, 0x60, 0x97, 0xC9, 0xA0, 0x90} }; } + class ITaskbarList : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE HrInit (void) = 0; + virtual HRESULT STDMETHODCALLTYPE AddTab (HWND hwnd) = 0; + virtual HRESULT STDMETHODCALLTYPE DeleteTab (HWND hwnd) = 0; + virtual HRESULT STDMETHODCALLTYPE ActivateTab (HWND hwnd) = 0; + virtual HRESULT STDMETHODCALLTYPE SetActiveAlt (HWND hwnd) = 0; + }; +#endif /* ITaskbarList */ + +#ifndef __ITaskbarList2_INTERFACE_DEFINED__ +#define __ITaskbarList2_INTERFACE_DEFINED__ + extern "C" {const GUID IID_ITaskbarList2 = {0x602D4995, 0xB13A, 0x429b, {0xA6, 0x6E, 0x19, 0x35, 0xE4, 0x4F, 0x43, 0x17} }; } + class ITaskbarList2 : public ITaskbarList + { + public: + virtual HRESULT STDMETHODCALLTYPE MarkFullscreenWindow(HWND hwnd, BOOL fFullscreen) = 0; + }; +#endif /* ITaskbarList2 */ + +#ifndef __ITaskbarList3_INTERFACE_DEFINED__ +#define __ITaskbarList3_INTERFACE_DEFINED__ +typedef enum THUMBBUTTONFLAGS {THBF_ENABLED = 0, THBF_DISABLED = 0x1, THBF_DISMISSONCLICK = 0x2, THBF_NOBACKGROUND = 0x4, THBF_HIDDEN = 0x8, THBF_NONINTERACTIVE = 0x10} THUMBBUTTONFLAGS; +typedef enum THUMBBUTTONMASK {THB_BITMAP = 0x1, THB_ICON = 0x2, THB_TOOLTIP = 0x4, THB_FLAGS = 0x8} THUMBBUTTONMASK; +typedef struct THUMBBUTTON {THUMBBUTTONMASK dwMask; UINT iId; UINT iBitmap; HICON hIcon; WCHAR szTip[260]; THUMBBUTTONFLAGS dwFlags; } THUMBBUTTON; +typedef enum TBPFLAG {TBPF_NOPROGRESS = 0, TBPF_INDETERMINATE = 0x1, TBPF_NORMAL = 0x2, TBPF_ERROR = 0x4, TBPF_PAUSED = 0x8 } TBPFLAG; +#define THBN_CLICKED 0x1800 + extern "C" {const GUID IID_ITaskList3 = { 0xEA1AFB91, 0x9E28, 0x4B86, {0x90, 0xE9, 0x9E, 0x9F, 0x8A, 0x5E, 0xEF, 0xAF} };} + + class ITaskbarList3 : public ITaskbarList2 + { + public: + virtual HRESULT STDMETHODCALLTYPE SetProgressValue (HWND hwnd, ULONGLONG ullCompleted, ULONGLONG ullTotal) = 0; + virtual HRESULT STDMETHODCALLTYPE SetProgressState (HWND hwnd, TBPFLAG tbpFlags) = 0; + virtual HRESULT STDMETHODCALLTYPE RegisterTab (HWND hwndTab, HWND hwndMDI) = 0; + virtual HRESULT STDMETHODCALLTYPE UnregisterTab (HWND hwndTab) = 0; + virtual HRESULT STDMETHODCALLTYPE SetTabOrder (HWND hwndTab, HWND hwndInsertBefore) = 0; + virtual HRESULT STDMETHODCALLTYPE SetTabActive (HWND hwndTab, HWND hwndMDI, DWORD dwReserved) = 0; + virtual HRESULT STDMETHODCALLTYPE ThumbBarAddButtons (HWND hwnd, UINT cButtons, THUMBBUTTON * pButton) = 0; + virtual HRESULT STDMETHODCALLTYPE ThumbBarUpdateButtons (HWND hwnd, UINT cButtons, THUMBBUTTON * pButton) = 0; + virtual HRESULT STDMETHODCALLTYPE ThumbBarSetImageList (HWND hwnd, HIMAGELIST himl) = 0; + virtual HRESULT STDMETHODCALLTYPE SetOverlayIcon (HWND hwnd, HICON hIcon, LPCWSTR pszDescription) = 0; + virtual HRESULT STDMETHODCALLTYPE SetThumbnailTooltip (HWND hwnd, LPCWSTR pszTip) = 0; + virtual HRESULT STDMETHODCALLTYPE SetThumbnailClip (HWND hwnd, RECT *prcClip) = 0; + }; +#endif /* ITaskbarList3 */ + +#endif /*GHOST_TASKBARWIN32_H_*/ diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 83f86840eb4..8d28c9d5b17 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -143,6 +143,7 @@ extern "C" { GHOST_TDragnDropTypes m_draggedObjectType; } - (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa; +- (GHOST_SystemCocoa*)systemCocoa; @end @implementation CocoaWindow - (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa @@ -150,6 +151,10 @@ extern "C" { systemCocoa = sysCocoa; associatedWindow = winCocoa; } +- (GHOST_SystemCocoa*)systemCocoa +{ + return systemCocoa; +} -(BOOL)canBecomeKeyWindow { @@ -280,6 +285,18 @@ extern "C" { return YES; } +- (void) drawRect:(NSRect)rect +{ + if ([self inLiveResize]) + { + //Don't redraw while in live resize + } + else + { + [super drawRect:rect]; + } +} + @end @@ -481,10 +498,10 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title) GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setTitle(): window invalid") NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *windowTitle = [[NSString alloc] initWithUTF8String:title]; + NSString *windowTitle = [[NSString alloc] initWithCString:title encoding:NSUTF8StringEncoding]; //Set associated file if applicable - if ([windowTitle hasPrefix:@"Blender"]) + if (windowTitle && [windowTitle hasPrefix:@"Blender"]) { NSRange fileStrRange; NSString *associatedFileName; @@ -497,13 +514,16 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title) { fileStrRange.length = len; associatedFileName = [windowTitle substringWithRange:fileStrRange]; + [m_window setTitle:[associatedFileName lastPathComponent]]; + + //Blender used file open/save functions converte file names into legal URL ones + associatedFileName = [associatedFileName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; @try { [m_window setRepresentedFilename:associatedFileName]; } @catch (NSException * e) { printf("\nInvalid file path given in window title"); } - [m_window setTitle:[associatedFileName lastPathComponent]]; } else { [m_window setTitle:windowTitle]; @@ -762,12 +782,15 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) [tmpWindow setReleasedWhenClosed:NO]; [tmpWindow setAcceptsMouseMovedEvents:YES]; [tmpWindow setDelegate:[m_window delegate]]; + [tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this]; + [tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, + NSStringPboardType, NSTIFFPboardType, nil]]; //Assign the openGL view to the new window [tmpWindow setContentView:m_openGLView]; //Show the new window - [tmpWindow makeKeyAndOrderFront:nil]; + [tmpWindow makeKeyAndOrderFront:m_openGLView]; //Close and release old window [m_window setDelegate:nil]; // To avoid the notification of "window closed" event [m_window close]; @@ -820,6 +843,11 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) [tmpWindow setReleasedWhenClosed:NO]; [tmpWindow setAcceptsMouseMovedEvents:YES]; [tmpWindow setDelegate:[m_window delegate]]; + [tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this]; + [tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, + NSStringPboardType, NSTIFFPboardType, nil]]; + //Forbid to resize the window below the blender defined minimum one + [tmpWindow setContentMinSize:NSMakeSize(320, 240)]; //Assign the openGL view to the new window [tmpWindow setContentView:m_openGLView]; diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 07f95d57ef3..06996059b82 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -160,6 +160,13 @@ protected: /** Window that was active before entering fullscreen state. */ GHOST_IWindow* m_activeWindowBeforeFullScreen; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_WindowManager"); } + void operator delete( void *mem ) { MEM_freeN(mem); } +#endif + }; #endif // _GHOST_WINDOW_MANAGER_H_ diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 1366aebf9e7..f5773ea2d90 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -139,33 +139,67 @@ GHOST_WindowWin32::GHOST_WindowWin32( m_stereo(stereoVisual), m_nextWindow(NULL) { + OSVERSIONINFOEX versionInfo; + bool hasMinVersionForTaskbar = false; + + ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEX)); + + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + + if(!GetVersionEx((OSVERSIONINFO *)&versionInfo)) { + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if(GetVersionEx((OSVERSIONINFO*)&versionInfo)) { + if((versionInfo.dwMajorVersion==6 && versionInfo.dwMinorVersion>=1) || versionInfo.dwMajorVersion >= 7) { + hasMinVersionForTaskbar = true; + } + } + } else { + if((versionInfo.dwMajorVersion==6 && versionInfo.dwMinorVersion>=1) || versionInfo.dwMajorVersion >= 7) { + hasMinVersionForTaskbar = true; + } + } + if (state != GHOST_kWindowStateFullScreen) { RECT rect; + MONITORINFO monitor; GHOST_TUns32 tw, th; width += GetSystemMetrics(SM_CXSIZEFRAME)*2; height += GetSystemMetrics(SM_CYSIZEFRAME)*2 + GetSystemMetrics(SM_CYCAPTION); + rect.left = left; + rect.right = left + width; + rect.top = top; + rect.bottom = top + height; + + monitor.cbSize=sizeof(monitor); + monitor.dwFlags=0; + // take taskbar into account - SystemParametersInfo(SPI_GETWORKAREA,0,&rect,0); - th = rect.bottom - rect.top; - tw = rect.right - rect.left; + GetMonitorInfo(MonitorFromRect(&rect,MONITOR_DEFAULTTONEAREST),&monitor); + + th = monitor.rcWork.bottom - monitor.rcWork.top; + tw = monitor.rcWork.right - monitor.rcWork.left; if(tw < width) { width = tw; - left = rect.left; + left = monitor.rcWork.left; } - else if(left < rect.left) - left = rect.left; + else if(monitor.rcWork.right < left + (int)width) + left = monitor.rcWork.right - width; + else if(left < monitor.rcWork.left) + left = monitor.rcWork.left; if(th < height) { height = th; - top = rect.top; + top = monitor.rcWork.top; } - else if(top < rect.top) - top = rect.top; + else if(monitor.rcWork.bottom < top + (int)height) + top = monitor.rcWork.bottom - height; + else if(top < monitor.rcWork.top) + top = monitor.rcWork.top; m_hWnd = ::CreateWindow( s_windowClassName, // pointer to registered class name @@ -175,7 +209,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( top, // vertical position of window width, // window width height, // window height - 0, // handle to parent or owner window + HWND_DESKTOP, // handle to parent or owner window 0, // handle to menu or child-window identifier ::GetModuleHandle(0), // handle to application instance 0); // pointer to window-creation data @@ -189,7 +223,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( top, // vertical position of window width, // window width height, // window height - 0, // handle to parent or owner window + HWND_DESKTOP, // handle to parent or owner window 0, // handle to menu or child-window identifier ::GetModuleHandle(0), // handle to application instance 0); // pointer to window-creation data @@ -294,11 +328,22 @@ GHOST_WindowWin32::GHOST_WindowWin32( } } } + + if(hasMinVersionForTaskbar) + CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList ,(LPVOID*)&m_Bar); + else + m_Bar=NULL; } GHOST_WindowWin32::~GHOST_WindowWin32() { + if(m_Bar) + { + m_Bar->SetProgressState(m_hWnd, TBPF_NOPROGRESS); + m_Bar->Release(); + }; + if (m_wintab) { GHOST_WIN32_WTClose fpWTClose = ( GHOST_WIN32_WTClose ) ::GetProcAddress( m_wintab, "WTClose" ); if (fpWTClose) { @@ -373,15 +418,24 @@ void GHOST_WindowWin32::getWindowBounds(GHOST_Rect& bounds) const void GHOST_WindowWin32::getClientBounds(GHOST_Rect& bounds) const { RECT rect; - + GHOST_TWindowState state= this->getState(); LONG_PTR result = ::GetWindowLongPtr(m_hWnd, GWL_STYLE); + int sm_cysizeframe = GetSystemMetrics(SM_CYSIZEFRAME); ::GetWindowRect(m_hWnd, &rect); if((result & (WS_POPUP | WS_MAXIMIZE)) != (WS_POPUP | WS_MAXIMIZE)) { - bounds.m_b = rect.bottom-GetSystemMetrics(SM_CYCAPTION)-GetSystemMetrics(SM_CYSIZEFRAME)*2; - bounds.m_l = rect.left; - bounds.m_r = rect.right-GetSystemMetrics(SM_CYSIZEFRAME)*2; - bounds.m_t = rect.top; + if(state==GHOST_kWindowStateMaximized) { + // in maximized state we don't have borders on the window + bounds.m_b = rect.bottom-GetSystemMetrics(SM_CYCAPTION)- sm_cysizeframe*2; + bounds.m_l = rect.left + sm_cysizeframe; + bounds.m_r = rect.right - sm_cysizeframe; + bounds.m_t = rect.top; + } else { + bounds.m_b = rect.bottom-GetSystemMetrics(SM_CYCAPTION)-sm_cysizeframe*2; + bounds.m_l = rect.left; + bounds.m_r = rect.right-sm_cysizeframe*2; + bounds.m_t = rect.top; + } } else { ::GetWindowRect(m_hWnd, &rect); bounds.m_b = rect.bottom; @@ -686,7 +740,7 @@ GHOST_TSuccess GHOST_WindowWin32::installDrawingContext(GHOST_TDrawingContextTyp m_hGlRc = ::wglCreateContext(m_hDC); if (m_hGlRc) { if (s_firsthGLRc) { - wglShareLists(s_firsthGLRc, m_hGlRc); + ::wglShareLists(s_firsthGLRc, m_hGlRc); } else { s_firsthGLRc = m_hGlRc; } @@ -751,11 +805,10 @@ GHOST_TSuccess GHOST_WindowWin32::removeDrawingContext() GHOST_TSuccess success; switch (m_drawingContextType) { case GHOST_kDrawingContextTypeOpenGL: - if (m_hGlRc) { + // we shouldn't remove the drawing context if it's the first OpenGL context + // If we do, we get corrupted drawing. See #19997 + if (m_hGlRc && m_hGlRc!=s_firsthGLRc) { success = ::wglDeleteContext(m_hGlRc) == TRUE ? GHOST_kSuccess : GHOST_kFailure; - if (m_hGlRc == s_firsthGLRc) { - s_firsthGLRc = NULL; - } m_hGlRc = 0; } else { @@ -1079,6 +1132,23 @@ GHOST_TSuccess GHOST_WindowWin32::setWindowCustomCursorShape(GHOST_TUns8 *bitmap } +GHOST_TSuccess GHOST_WindowWin32::setProgressBar(float progress) +{ + /*SetProgressValue sets state to TBPF_NORMAL automaticly*/ + if(m_Bar && S_OK == m_Bar->SetProgressValue(m_hWnd,10000*progress,10000)) + return GHOST_kSuccess; + + return GHOST_kFailure; +} + +GHOST_TSuccess GHOST_WindowWin32::endProgressBar() +{ + if(m_Bar && S_OK == m_Bar->SetProgressState(m_hWnd,TBPF_NOPROGRESS)) + return GHOST_kSuccess; + + return GHOST_kFailure; +} + /* Ron Fosner's code for weighting pixel formats and forcing software. See http://www.opengl.org/resources/faq/technical/weight.cpp */ diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index a4d31f87ffa..c3b7fdbd3f3 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -39,7 +39,18 @@ #include "GHOST_Window.h" +/* MinGW needs it */ +#ifdef FREE_WINDOWS +#ifdef WINVER +#undef WINVER +#endif +#define WINVER 0x0501 +#endif + + + #include <windows.h> +#include "GHOST_TaskbarWin32.h" #include <wintab.h> @@ -218,6 +229,17 @@ public: virtual GHOST_TSuccess invalidate(); /** + * Sets the progress bar value displayed in the window/application icon + * @param progress The progress % + */ + virtual GHOST_TSuccess setProgressBar(float progress); + + /** + * Hides the progress bar in the icon + */ + virtual GHOST_TSuccess endProgressBar(); + + /** * Returns the name of the window class. * @return The name of the window class. */ @@ -324,6 +346,9 @@ protected: /** HCURSOR structure of the custom cursor */ HCURSOR m_customCursor; + /** ITaskbarList3 structure for progress bar*/ + ITaskbarList3 * m_Bar; + static LPCSTR s_windowClassName; static const int s_maxTitleLength; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 60e12ff78df..c9f39bc7c2c 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -177,9 +177,20 @@ GHOST_WindowX11( Atom atoms[2]; int natom; int glxVersionMajor, glxVersionMinor; // As in GLX major.minor + + /* initialize incase X11 fails to load */ + memset(&m_xtablet, 0, sizeof(m_xtablet)); + m_visual= NULL; if (!glXQueryVersion(m_display, &glxVersionMajor, &glxVersionMinor)) { printf("%s:%d: X11 glXQueryVersion() failed, verify working openGL system!\n", __FILE__, __LINE__); + + /* exit if this is the first window */ + if(s_firstContext==NULL) { + printf("initial window could not find the GLX extension, exit!\n"); + exit(1); + } + return; } @@ -211,6 +222,12 @@ GHOST_WindowX11( if (samples == 0) { /* All options exhausted, cannot continue */ printf("%s:%d: X11 glXChooseVisual() failed, verify working openGL system!\n", __FILE__, __LINE__); + + if(s_firstContext==NULL) { + printf("initial window could not find the GLX extension, exit!\n"); + exit(1); + } + return; } } else { @@ -221,8 +238,6 @@ GHOST_WindowX11( } } - memset(&m_xtablet, 0, sizeof(m_xtablet)); - // Create a bunch of attributes needed to create an X window. @@ -327,13 +342,15 @@ GHOST_WindowX11( // we want this window treated. XSizeHints * xsizehints = XAllocSizeHints(); - xsizehints->flags = PPosition | PSize | PMinSize; + xsizehints->flags = PPosition | PSize | PMinSize | PMaxSize; xsizehints->x = left; xsizehints->y = top; xsizehints->width = width; xsizehints->height = height; xsizehints->min_width= 320; // size hints, could be made apart of the ghost api xsizehints->min_height= 240; // limits are also arbitrary, but should not allow 1x1 window + xsizehints->max_width= 65535; + xsizehints->max_height= 65535; XSetWMNormalHints(m_display, m_window, xsizehints); XFree(xsizehints); @@ -657,7 +674,7 @@ setTitle( XChangeProperty(m_display, m_window, name, utf8str, 8, PropModeReplace, (const unsigned char*) title.ReadPtr(), - strlen(title.ReadPtr())); + title.Length()); // This should convert to valid x11 string // and getTitle would need matching change diff --git a/intern/ghost/intern/Makefile b/intern/ghost/intern/Makefile deleted file mode 100644 index 2f5e088f4fe..00000000000 --- a/intern/ghost/intern/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): GSR -# -# ***** END GPL LICENSE BLOCK ***** -# ghost intern Makefile -# - -LIBNAME = ghost -DIR = $(OCGDIR)/intern/$(LIBNAME) - -CCSRCS = GHOST_Buttons.cpp GHOST_System.cpp GHOST_Window.cpp -CCSRCS += GHOST_EventManager.cpp GHOST_EventPrinter.cpp GHOST_WindowManager.cpp -CCSRCS += GHOST_ISystem.cpp GHOST_ModifierKeys.cpp GHOST_TimerManager.cpp -CCSRCS += GHOST_Rect.cpp GHOST_DisplayManager.cpp GHOST_C-api.cpp -CCSRCS += GHOST_CallbackEventConsumer.cpp -CCSRCS += GHOST_NDOFManager.cpp GHOST_Path-api.cpp - -ifeq ($(OS),$(findstring $(OS), "darwin")) - ifeq ($(WITH_COCOA), true) - OCCSRCS += $(wildcard *Cocoa.mm) - CPPFLAGS += -DGHOST_COCOA - ifeq ($(WITH_QUICKTIME), true) - CPPFLAGS += -DWITH_QUICKTIME - endif - else - CCSRCS += $(wildcard *Carbon.cpp) - endif -endif - -ifeq ($(OS),$(findstring $(OS), "windows")) - CPPFLAGS += -I$(NAN_WINTAB)/include - CCSRCS += $(wildcard *Win32.cpp) -endif - -ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris")) - CCSRCS += $(wildcard *X11.cpp) -endif - -include nan_compile.mk - -#CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include -CPPFLAGS += -I.. -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I../../../source/blender/imbuf -CPPFLAGS += -I../../../source/blender/makesdna - diff --git a/intern/ghost/make/msvc/ghost.dsp b/intern/ghost/make/msvc/ghost.dsp deleted file mode 100644 index 741d1c3a247..00000000000 --- a/intern/ghost/make/msvc/ghost.dsp +++ /dev/null @@ -1,292 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ghost" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ghost - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ghost.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ghost.mak" CFG="ghost - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ghost - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ghost - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ghost - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\libghost.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying GHOST files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\*.lib ..\..\..\..\..\lib\windows\ghost\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "ghost - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\ghost\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /I "../../../../../lib/windows/string/include" /I "..\..\..\..\intern\string" /I "../../../../../lib/windows/wintab/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\debug\libghost.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Copying GHOST files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\ghost\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\ghost\debug\*.lib ..\..\..\..\..\lib\windows\ghost\lib\debug\*.a ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "ghost - Win32 Release"
-# Name "ghost - Win32 Debug"
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Buttons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_CallbackEventConsumer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManagerWin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventButton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventCursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventKey.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventPrinter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventWheel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ModifierKeys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_System.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_SystemWin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowWin32.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\GHOST_C-api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IEventConsumer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_ISystem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_ITimerTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_IWindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_Rect.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\GHOST_Types.h
-# End Source File
-# End Group
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Buttons.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\GHOST_C-api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_CallbackEventConsumer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_DisplayManagerWin32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_EventPrinter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ISystem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_ModifierKeys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Rect.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_System.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_SystemWin32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_TimerManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_Window.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\GHOST_WindowWin32.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/ghost/make/msvc/ghost.dsw b/intern/ghost/make/msvc/ghost.dsw deleted file mode 100644 index a98e7644c11..00000000000 --- a/intern/ghost/make/msvc/ghost.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ghost"=".\ghost.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/ghost/make/msvc_7_0/ghost.sln b/intern/ghost/make/msvc_7_0/ghost.sln deleted file mode 100644 index a2073664ca5..00000000000 --- a/intern/ghost/make/msvc_7_0/ghost.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghost", "ghost.vcproj", "{37364341-0C53-433A-B4CC-CDDD176CABC5}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {37364341-0C53-433A-B4CC-CDDD176CABC5}.Debug.ActiveCfg = Debug|Win32 - {37364341-0C53-433A-B4CC-CDDD176CABC5}.Debug.Build.0 = Debug|Win32 - {37364341-0C53-433A-B4CC-CDDD176CABC5}.Release.ActiveCfg = Release|Win32 - {37364341-0C53-433A-B4CC-CDDD176CABC5}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj deleted file mode 100644 index e5b2e09a678..00000000000 --- a/intern/ghost/make/msvc_7_0/ghost.vcproj +++ /dev/null @@ -1,410 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="ghost" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\ghost" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\ghost" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\ghost\ghost.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\ghost\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\ghost\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\ghost\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libghost.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GHOST files library (release target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_7\intern\ghost\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\ghost\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_USE_MATH_DEFINES" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\ghost\debug\ghost.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\ghost\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\ghost\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\ghost\debug\" - BrowseInformation="1" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libghost.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GHOST files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_7\intern\ghost\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\ghost\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\ghost.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libghost.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GHOST files library (release target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_7\intern\ghost\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\ghost\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug\ghost.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\ghost\mtdll\debug\" - BrowseInformation="1" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libghost.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying GHOST files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_7\intern\ghost\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\ghost\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Header Files" - Filter=""> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\GHOST_Buttons.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_CallbackEventConsumer.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_Debug.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_DisplayManager.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_DisplayManagerWin32.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_Event.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventButton.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventCursor.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventKey.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventManager.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventNDOF.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventPrinter.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventWheel.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventWindow.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_ModifierKeys.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_NDOFManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_System.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_SystemWin32.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_TimerManager.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_TimerTask.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_Window.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_WindowManager.h"> - </File> - <File - RelativePath="..\..\intern\GHOST_WindowWin32.h"> - </File> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\GHOST_C-api.h"> - </File> - <File - RelativePath="..\..\GHOST_IEvent.h"> - </File> - <File - RelativePath="..\..\GHOST_IEventConsumer.h"> - </File> - <File - RelativePath="..\..\GHOST_ISystem.h"> - </File> - <File - RelativePath="..\..\GHOST_ITimerTask.h"> - </File> - <File - RelativePath="..\..\GHOST_IWindow.h"> - </File> - <File - RelativePath="..\..\GHOST_Rect.h"> - </File> - <File - RelativePath="..\..\GHOST_Types.h"> - </File> - </Filter> - </Filter> - <Filter - Name="Source Files" - Filter=""> - <File - RelativePath="..\..\intern\GHOST_Buttons.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_C-api.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_CallbackEventConsumer.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_DisplayManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_DisplayManagerWin32.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_EventPrinter.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_ISystem.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_ModifierKeys.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_NDOFManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_Rect.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_System.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_SystemWin32.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_TimerManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_Window.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_WindowManager.cpp"> - </File> - <File - RelativePath="..\..\intern\GHOST_WindowWin32.cpp"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/ghost/make/msvc_9_0/ghost.vcproj b/intern/ghost/make/msvc_9_0/ghost.vcproj deleted file mode 100644 index b51e14275c9..00000000000 --- a/intern/ghost/make/msvc_9_0/ghost.vcproj +++ /dev/null @@ -1,568 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_ghost"
- ProjectGUID="{76D90B92-ECC7-409C-9F98-A8814B90F3C0}"
- RootNamespace="ghost"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\ghost"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\ghost"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\ghost\ghost.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\ghost\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\ghost\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\ghost\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libghost.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying GHOST files library (release target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_9\intern\ghost\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\ghost\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_USE_MATH_DEFINES"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\ghost\debug\ghost.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\ghost\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\ghost\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\ghost\debug\"
- BrowseInformation="1"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libghost.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying GHOST files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_9\intern\ghost\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\ghost\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\ghost.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libghost.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying GHOST files library (release target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_9\intern\ghost\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\ghost\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug\ghost.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\ghost\mtdll\debug\"
- BrowseInformation="1"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libghost.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying GHOST files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\ghost\include MKDIR ..\..\..\..\..\build\msvc_9\intern\ghost\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\ghost\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Header Files"
- >
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\GHOST_Buttons.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_CallbackEventConsumer.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Debug.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DisplayManager.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DisplayManagerWin32.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DropTargetWin32.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Event.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventButton.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventCursor.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventDragnDrop.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventKey.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventManager.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventNDOF.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventPrinter.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventString.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventTrackpad.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventWheel.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventWindow.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_ModifierKeys.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_NDOFManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_System.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_SystemWin32.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_TimerManager.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_TimerTask.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Window.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_WindowManager.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_WindowWin32.h"
- >
- </File>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\GHOST_C-api.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_IEvent.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_IEventConsumer.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_ISystem.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_ITimerTask.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_IWindow.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_Path-api.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_Rect.h"
- >
- </File>
- <File
- RelativePath="..\..\GHOST_Types.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Source Files"
- >
- <File
- RelativePath="..\..\intern\GHOST_Buttons.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_C-api.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_CallbackEventConsumer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DisplayManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DisplayManagerWin32.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_DropTargetWin32.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_EventPrinter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_ISystem.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_ModifierKeys.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_NDOFManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Path-api.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Rect.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_System.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_SystemWin32.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_TimerManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_Window.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_WindowManager.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\GHOST_WindowWin32.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/ghost/test/Makefile b/intern/ghost/test/Makefile deleted file mode 100644 index d4250cecf26..00000000000 --- a/intern/ghost/test/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# GHOST test applications makefile. -# This bounces to test application directories. -# - -LIBNAME = ghost -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = gears multitest - -include nan_subdirs.mk - -include nan_compile.mk -include nan_link.mk - -OCGGHOST = $(OCGDIR)/intern/$(LIBNAME) -GEARDIR = $(OCGGHOST)/test/$(DEBUG_DIR)gears.app - -LIBS = $(OCGGHOST)/$(DEBUG_DIR)libghost.a -SLIBS += $(LCGDIR)/string/lib/libstring.a - -all debug:: $(LIBS) - @echo "****> linking $@ in $(SOURCEDIR)" -ifeq ($(OS),darwin) - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)gears $(DIR)/$(DEBUG_DIR)GHOST_Test.o $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS) - @# set up directory structure for the OSX application bundle - @[ -d $(OCGGHOST)/test/ ] || mkdir $(OCGGHOST)/test/ - @[ -d $(OCGGHOST)/test/debug ] || mkdir $(OCGGHOST)/test/debug - @[ -d $(GEARDIR) ] || mkdir $(GEARDIR) - @[ -d $(GEARDIR)/Contents ] || mkdir $(GEARDIR)/Contents - @[ -d $(GEARDIR)/Contents/MacOS ] || mkdir $(GEARDIR)/Contents/MacOS - @[ -d $(GEARDIR)/Contents/Resources ] || mkdir $(GEARDIR)/Contents/Resources - @[ -d $(GEARDIR)/Contents/Resources/English.lproj ] || mkdir $(GEARDIR)/Contents/Resources/English.lproj - @[ -d $(GEARDIR)/Contents/Resources/English.lproj/MainMenu.nib ] || mkdir $(GEARDIR)/Contents/Resources/English.lproj/MainMenu.nib - @# copy the files into the bundle directory tree - cp -f $(DIR)/$(DEBUG_DIR)gears $(GEARDIR)/Contents/MacOS - cp -f gears/resources/osx/PkgInfo $(GEARDIR)/Contents/ - cp -f gears/resources/osx/Info.plist $(GEARDIR)/Contents/ - cp -f gears/resources/osx/English.lproj/InfoPlist.strings $(GEARDIR)/Contents/Resources/English.lproj - cp -f gears/resources/osx/English.lproj/MainMenu.nib/classes.nib $(GEARDIR)/Contents/Resources/English.lproj - cp -f gears/resources/osx/English.lproj/MainMenu.nib/info.nib $(GEARDIR)/Contents/Resources/English.lproj - cp -f gears/resources/osx/English.lproj/MainMenu.nib/objects.nib $(GEARDIR)/Contents/Resources/English.lproj -else - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)gears_cpp $(DIR)/$(DEBUG_DIR)GHOST_Test.o $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS) - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)gears_c $(DIR)/$(DEBUG_DIR)GHOST_C-Test.o $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS) -endif - -clean:: - @# mac stuff. well ok, only the binary - @rm -f $(DIR)/gears $(DIR)/debug/gears - @# others - @rm -f $(DIR)/gears_c $(DIR)/debug/gears_c - @rm -f $(DIR)/gears_cpp $(DIR)/debug/gears_cpp - -test:: all - $(DIR)/gears_cpp - $(DIR)/gears_c diff --git a/intern/ghost/test/gears/Makefile b/intern/ghost/test/gears/Makefile deleted file mode 100644 index 23e76778f69..00000000000 --- a/intern/ghost/test/gears/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# GHOST gears test application Makefile -# - -LIBNAME = gearstest -DIR = $(OCGDIR)/intern/ghost/test - -# we don't want a library here, only object files: -ALLTARGETS = $(OBJS) - -include nan_compile.mk - -CFLAGS += $(LEVEL_2_C_WARNINGS) -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I../.. - diff --git a/intern/ghost/test/make/msvc_6_0/gears.dsp b/intern/ghost/test/make/msvc_6_0/gears.dsp deleted file mode 100644 index e068231bf32..00000000000 --- a/intern/ghost/test/make/msvc_6_0/gears.dsp +++ /dev/null @@ -1,102 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "gears.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "gears.mak" CFG="gears - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gears - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "gears - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "gears - Win32 Release"
-# Name "gears - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\gears\GHOST_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/intern/ghost/test/make/msvc_6_0/gears_C.dsp b/intern/ghost/test/make/msvc_6_0/gears_C.dsp deleted file mode 100644 index df0ae0448fd..00000000000 --- a/intern/ghost/test/make/msvc_6_0/gears_C.dsp +++ /dev/null @@ -1,102 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gears_C" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears_C - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "gears_C.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "gears_C.mak" CFG="gears_C - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "gears_C - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears_C - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gears_C - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../string" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "gears_C - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Intermediate_Dir "../../../../../../obj/windows/intern/ghost/test/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../../../../string" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "gears_C - Win32 Release"
-# Name "gears_C - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\gears\GHOST_C-Test.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/intern/ghost/test/make/msvc_6_0/ghost_test.dsw b/intern/ghost/test/make/msvc_6_0/ghost_test.dsw deleted file mode 100644 index 7a56a3b5ef1..00000000000 --- a/intern/ghost/test/make/msvc_6_0/ghost_test.dsw +++ /dev/null @@ -1,77 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gears"=.\gears.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name ghost
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name string
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gears_C"=.\gears_C.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name ghost
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name string
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ghost"=..\..\..\make\msvc\ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "string"=..\..\..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 1dbaad35994..859600bb783 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -125,7 +125,7 @@ static char *keytype_to_string(GHOST_TKey key) { K(KeyRightControl); K(KeyLeftAlt); K(KeyRightAlt); - K(KeyCommand); + K(KeyOS); K(KeyCapsLock); K(KeyNumLock); diff --git a/intern/ghost/test/multitest/Makefile b/intern/ghost/test/multitest/Makefile deleted file mode 100644 index 1ecbcd98e2b..00000000000 --- a/intern/ghost/test/multitest/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# GHOST gears test application Makefile -# - -DIR = $(OCGDIR)/intern/ghost/test - -# we don't want a library here, only object files: -ALLTARGETS = $(OBJS) - -include nan_compile.mk -include nan_link.mk - -CFLAGS += $(LEVEL_1_C_WARNINGS) -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include -CPPFLAGS += -I../.. - -OCGGHOST = $(OCGDIR)/intern/ghost - -LIBS = $(OCGGHOST)/$(DEBUG_DIR)libghost.a -SLIBS += $(LCGDIR)/string/lib/libstring.a -SLIBS += $(LCGDIR)/guardedalloc/lib/libguardedalloc.a - -all:: - @echo "- link $(DIR)/$(DEBUG_DIR)multitest -" - @$(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)multitest $(OBJS) $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS) diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 29e4f553974..eb101eee102 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -24,20 +24,29 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +set(INC .) -SET(SRC +set(SRC ./intern/mallocn.c + + BLO_sys_types.h + MEM_guardedalloc.h ) -IF(WIN32) - LIST(APPEND SRC ./intern/mmap_win.c) -ENDIF(WIN32) +if(WIN32 AND NOT UNIX) + list(APPEND SRC + intern/mmap_win.c + + mmap_win.h + ) +endif() -BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}") +blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}") # Override C++ alloc, optional. -IF(WITH_CXX_GUARDEDALLOC) - SET(SRC cpp/mallocn.cpp) - BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") -ENDIF(WITH_CXX_GUARDEDALLOC) +if(WITH_CXX_GUARDEDALLOC) + set(SRC + cpp/mallocn.cpp + ) + blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") +endif() diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 6b78b0b6bdc..d712a6ac2d9 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -59,6 +59,13 @@ #include "stdio.h" /* needed for FILE* */ #include "BLO_sys_types.h" /* needed for uintptr_t */ +#ifdef __GNUC__ +# define WARN_UNUSED __attribute__((warn_unused_result)) +#else +# define WARN_UNUSED +#endif + + #ifdef __cplusplus extern "C" { #endif @@ -66,7 +73,7 @@ extern "C" { /** Returns the length of the allocated memory segment pointed at * by vmemh. If the pointer was not previously allocated by this * module, the result is undefined.*/ - size_t MEM_allocN_len(void *vmemh); + size_t MEM_allocN_len(void *vmemh) WARN_UNUSED; /** * Release memory previously allocatred by this module. @@ -82,30 +89,30 @@ extern "C" { /** * Duplicates a block of memory, and returns a pointer to the * newly allocated block. */ - void *MEM_dupallocN(void *vmemh); + void *MEM_dupallocN(void *vmemh) WARN_UNUSED; /** * Reallocates a block of memory, and returns pointer to the newly * allocated block, the old one is freed. this is not as optimized * as a system realloc but just makes a new allocation and copies * over from existing memory. */ - void *MEM_reallocN(void *vmemh, size_t len); + void *MEM_reallocN(void *vmemh, size_t len) WARN_UNUSED; /** * Allocate a block of memory of size len, with tag name str. The * memory is cleared. The name must be static, because only a * pointer to it is stored ! */ - void *MEM_callocN(size_t len, const char * str); + void *MEM_callocN(size_t len, const char * str) WARN_UNUSED; /** Allocate a block of memory of size len, with tag name str. The * name must be a static, because only a pointer to it is stored ! * */ - void *MEM_mallocN(size_t len, const char * str); + void *MEM_mallocN(size_t len, const char * str) WARN_UNUSED; /** Same as callocN, clears memory and uses mmap (disk cached) if supported. Can be free'd with MEM_freeN as usual. * */ - void *MEM_mapallocN(size_t len, const char * str); + void *MEM_mapallocN(size_t len, const char * str) WARN_UNUSED; /** Print a list of the names and sizes of all allocated memory * blocks. as a python dict for easy investigation */ @@ -148,8 +155,12 @@ extern "C" { void MEM_reset_peak_memory(void); /*get the peak memory usage in bytes, including mmap allocations*/ - uintptr_t MEM_get_peak_memory(void); + uintptr_t MEM_get_peak_memory(void) WARN_UNUSED; +#ifndef NDEBUG +const char *MEM_name_ptr(void *vmemh); +#endif + #ifdef __cplusplus } #endif diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile deleted file mode 100644 index 55894d54c8e..00000000000 --- a/intern/guardedalloc/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# decimation main makefile. -# - -include nan_definitions.mk - -LIBNAME = guardedalloc -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_GUARDEDALLOC) ] || mkdir $(NAN_GUARDEDALLOC) - @[ -d $(NAN_GUARDEDALLOC)/include ] || mkdir $(NAN_GUARDEDALLOC)/include - @[ -d $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_GUARDEDALLOC)/lib/$(DEBUG_DIR)libguardedalloc.a -endif - @../tools/cpifdiff.sh *.h $(NAN_GUARDEDALLOC)/include/ - diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 0c9c7d13608..74d6e07269f 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -2,7 +2,14 @@ Import('env') -sources = env.Glob('intern/*.c') +defs = [] + +sources = ['intern/mallocn.c', 'intern/mmap_win.c'] + +if env['WITH_BF_CXX_GUARDEDALLOC']: + sources.append('cpp/mallocn.cpp') + defs.append('WITH_CXX_GUARDEDALLOC') + incs = '.' -env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] ) +env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] ) diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp index bf51409e84f..b4d19a62bdc 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -26,7 +26,7 @@ void* operator new (size_t size) { - return MEM_mallocN(size, "c++/anonymous"); + return MEM_mallocN(size, "C++/anonymous"); } /* not default but can be used when needing to set a string */ diff --git a/intern/guardedalloc/intern/Makefile b/intern/guardedalloc/intern/Makefile deleted file mode 100644 index a55d6375014..00000000000 --- a/intern/guardedalloc/intern/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# guardedalloc intern Makefile -# - -LIBNAME = guardedalloc -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CFLAGS += $(NAN_LEVEL_2_C_WARNINGS) - -CPPFLAGS += -I.. - diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 09f2d33a674..83aceb12344 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -57,7 +57,7 @@ /* Only for debugging: * lets you count the allocations so as to find the allocator of unfreed memory - * in situations where the leak is pradictable */ + * in situations where the leak is predictable */ // #define DEBUG_MEMCOUNTER @@ -177,13 +177,13 @@ static void print_error(const char *str, ...) if (error_callback) error_callback(buf); } -static void mem_lock_thread() +static void mem_lock_thread(void) { if (thread_lock_callback) thread_lock_callback(); } -static void mem_unlock_thread() +static void mem_unlock_thread(void) { if (thread_unlock_callback) thread_unlock_callback(); @@ -502,7 +502,7 @@ static void MEM_printmemlist_internal( int pydict ) } while(membl) { if (pydict) { - fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, membl+1); + fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, (void *)(membl+1)); } else { #ifdef DEBUG_MEMCOUNTER print_error("%s len: " SIZET_FORMAT " %p, count: %d\n", membl->name, SIZET_ARG(membl->len), membl+1, membl->_count); @@ -856,4 +856,18 @@ int MEM_get_memory_blocks_in_use(void) return _totblock; } +#ifndef NDEBUG +const char *MEM_name_ptr(void *vmemh) +{ + if (vmemh) { + MemHead *memh= vmemh; + memh--; + return memh->name; + } + else { + return "MEM_name_ptr(NULL)"; + } +} +#endif + /* eof */ diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index c09be8c24a8..d8e53fc9bd1 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -42,6 +42,13 @@ #define FILE_MAP_EXECUTE 0x0020 #endif +/* copied from BKE_utildefines.h ugh */ +#ifdef __GNUC__ +# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) +#else +# define UNUSED(x) x +#endif + /* --------------------------------------------------------------------- */ /* local storage definitions */ /* --------------------------------------------------------------------- */ @@ -86,7 +93,7 @@ volatile static struct mmapListBase *mmapbase = &_mmapbase; /* --------------------------------------------------------------------- */ /* mmap for windows */ -void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset) +void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t offset) { HANDLE fhandle = INVALID_HANDLE_VALUE; HANDLE maphandle; @@ -151,7 +158,7 @@ void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset) } /* munmap for windows */ -intptr_t munmap(void *ptr, intptr_t size) +intptr_t munmap(void *ptr, intptr_t UNUSED(size)) { MemMap *mm = mmap_findlink(mmapbase, ptr); if (!mm) { diff --git a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp deleted file mode 100644 index 1c02b639a30..00000000000 --- a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp +++ /dev/null @@ -1,114 +0,0 @@ -# Microsoft Developer Studio Project File - Name="guardedalloc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=guardedalloc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "guardedalloc.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "guardedalloc.mak" CFG="guardedalloc - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "guardedalloc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "guardedalloc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "guardedalloc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\libguardedalloc.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "guardedalloc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\guardedalloc\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\debug\libguardedalloc.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\guardedalloc\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\guardedalloc\debug\*.lib ..\..\..\..\..\lib\windows\guardedalloc\lib\debug\*.a ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "guardedalloc - Win32 Release"
-# Name "guardedalloc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\mallocn.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\MEM_guardedalloc.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.sln b/intern/guardedalloc/make/msvc_7_0/guardedalloc.sln deleted file mode 100644 index b2557eee949..00000000000 --- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guardedalloc", "guardedalloc.vcproj", "{1CC733F1-6AB5-4904-8F63-C08C46B79DD9}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}.Debug.ActiveCfg = Debug|Win32 - {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}.Debug.Build.0 = Debug|Win32 - {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}.Release.ActiveCfg = Release|Win32 - {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj deleted file mode 100644 index 974acef4e70..00000000000 --- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj +++ /dev/null @@ -1,282 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="guardedalloc" - ProjectGUID="{1CC733F1-6AB5-4904-8F63-C08C46B79DD9}" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\guardedalloc.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\guardedalloc\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\guardedalloc\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libguardedalloc.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug\guardedalloc.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\guardedalloc\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libguardedalloc.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\guardedalloc.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libguardedalloc.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug\guardedalloc.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\guardedalloc\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libguardedalloc.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\guardedalloc\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\..\intern\mallocn.c"> - </File> - <File - RelativePath="..\..\intern\mmap_win.c"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\BLO_sys_types.h"> - </File> - <File - RelativePath="..\..\MEM_guardedalloc.h"> - </File> - <File - RelativePath="..\..\mmap_win.h"> - </File> - </Filter> - <Filter - Name="intern" - Filter=""> - </Filter> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj deleted file mode 100644 index 16deb7b71fa..00000000000 --- a/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj +++ /dev/null @@ -1,370 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_guardedalloc"
- ProjectGUID="{1CC733F1-6AB5-4904-8F63-C08C46B79DD9}"
- RootNamespace="guardedalloc"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\guardedalloc.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\guardedalloc\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\guardedalloc\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libguardedalloc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug\guardedalloc.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\guardedalloc\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libguardedalloc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\guardedalloc.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libguardedalloc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug\guardedalloc.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\guardedalloc\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libguardedalloc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include MKDIR ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\guardedalloc\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\intern\mallocn.c"
- >
- </File>
- <File
- RelativePath="..\..\intern\mmap_win.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\BLO_sys_types.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_guardedalloc.h"
- >
- </File>
- <File
- RelativePath="..\..\mmap_win.h"
- >
- </File>
- </Filter>
- <Filter
- Name="intern"
- >
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/guardedalloc/test/Makefile b/intern/guardedalloc/test/Makefile deleted file mode 100644 index a0feb359940..00000000000 --- a/intern/guardedalloc/test/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the guarded memory module -# - -LIBNAME = guardedalloc -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = simpletest - -include nan_subdirs.mk - -include nan_compile.mk -include nan_link.mk - -TESTLIBS = $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)lib$(LIBNAME).a - -all debug:: - @echo "****> linking $@ in $(SOURCEDIR)" - $(CC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)memtest $(DIR)/memtest.o $(TESTLIBS) - -clean:: - $(RM) $(DIR)/memtest $(DIR)/debug/memtest - -test:: $(DIR)/memtest - $(DIR)/memtest $(NAN_TEST_VERBOSITY) - diff --git a/intern/guardedalloc/test/simpletest/Makefile b/intern/guardedalloc/test/simpletest/Makefile deleted file mode 100644 index 2ee39564b75..00000000000 --- a/intern/guardedalloc/test/simpletest/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# Test the guarded memory module -# - -LIBNAME = guardedalloc -DIR = $(OCGDIR)/intern/$(LIBNAME)/test - -# we don't want a library here, only object files: -ALLTARGETS = $(OBJS) - -include nan_compile.mk - -# this module's header -CPPFLAGS = -I../.. - diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 50ae78d6d16..46be310b7ec 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -24,12 +24,50 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC intern ../memutil ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/IK_QJacobian.cpp + intern/IK_QJacobianSolver.cpp + intern/IK_QSegment.cpp + intern/IK_QTask.cpp + intern/IK_Solver.cpp + intern/MT_ExpMap.cpp -BLENDERLIB(bf_intern_ik "${SRC}" "${INC}") + extern/IK_solver.h + intern/IK_QJacobian.h + intern/IK_QJacobianSolver.h + intern/IK_QSegment.h + intern/IK_QTask.h + intern/MT_ExpMap.h + intern/TNT/cholesky.h + intern/TNT/cmat.h + intern/TNT/fcscmat.h + intern/TNT/fmat.h + intern/TNT/fortran.h + intern/TNT/fspvec.h + intern/TNT/index.h + intern/TNT/lapack.h + intern/TNT/lu.h + intern/TNT/qr.h + intern/TNT/region1d.h + intern/TNT/region2d.h + intern/TNT/stopwatch.h + intern/TNT/subscript.h + intern/TNT/svd.h + intern/TNT/tnt.h + intern/TNT/tntmath.h + intern/TNT/tntreqs.h + intern/TNT/transv.h + intern/TNT/triang.h + intern/TNT/trisolve.h + intern/TNT/vec.h + intern/TNT/vecadaptor.h + intern/TNT/version.h +) + +blender_add_lib(bf_intern_ik "${SRC}" "${INC}") diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile deleted file mode 100644 index 09e6e3a1c2a..00000000000 --- a/intern/iksolver/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver main makefile. -# - -include nan_definitions.mk - -LIBNAME = iksolver -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_IKSOLVER) ] || mkdir $(NAN_IKSOLVER) - @[ -d $(NAN_IKSOLVER)/include ] || mkdir $(NAN_IKSOLVER)/include - @[ -d $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libiksolver.a $(NAN_IKSOLVER)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_IKSOLVER)/include/ - diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index 84bebce5097..f6073a94a96 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -34,7 +34,6 @@ #include "MT_Transform.h" #include "MT_Matrix4x4.h" #include "IK_QJacobian.h" -#include "MEM_SmartPtr.h" #include <vector> diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 1add6f638cf..beb82f08ed4 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -45,6 +45,7 @@ public: std::list<IK_QTask*> tasks; }; +// FIXME: locks still result in small "residual" changes to the locked axes... IK_QSegment *CreateSegment(int flag, bool translate) { int ndof = 0; diff --git a/intern/iksolver/intern/Makefile b/intern/iksolver/intern/Makefile deleted file mode 100644 index 8c90a9d5759..00000000000 --- a/intern/iksolver/intern/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver intern Makefile -# - -LIBNAME = iksolver -DIR = $(OCGDIR)/intern/$(LIBNAME) -CCSRCS = IK_QJacobianSolver.cpp IK_QSegment.cpp IK_Solver.cpp IK_QJacobian.cpp -CCSRCS += IK_QTask.cpp - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include - diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsp b/intern/iksolver/make/msvc_6_0/iksolver.dsp deleted file mode 100644 index f40ef72a62a..00000000000 --- a/intern/iksolver/make/msvc_6_0/iksolver.dsp +++ /dev/null @@ -1,260 +0,0 @@ -# Microsoft Developer Studio Project File - Name="iksolver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=iksolver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "iksolver.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "iksolver.mak" CFG="iksolver - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "iksolver - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "iksolver - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "iksolver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\libiksolver.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "iksolver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\iksolver\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\intern\moto\include" /I "..\..\..\..\intern\memutil" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\debug\libiksolver.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\iksolver\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\iksolver\debug\*.lib ..\..\..\..\..\lib\windows\iksolver\lib\debug\*.a ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "iksolver - Win32 Release"
-# Name "iksolver - Win32 Debug"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "TNT"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\cholesky.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\cmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fcscmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fmat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fortran.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\fspvec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\index.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\lapack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\lu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\qr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\region1d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\region2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\stopwatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\subscript.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\svd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tnt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tntmath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\tntreqs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\transv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\triang.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\trisolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\vec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\vecadaptor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\TNT\version.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobian.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobian.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobianSolver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QJacobianSolver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSegment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSegment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QSolver_Class.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QTask.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_QTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\IK_Solver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_ExpMap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_ExpMap.h
-# End Source File
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\extern\IK_solver.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsw b/intern/iksolver/make/msvc_6_0/iksolver.dsw deleted file mode 100644 index 9771088c42d..00000000000 --- a/intern/iksolver/make/msvc_6_0/iksolver.dsw +++ /dev/null @@ -1,35 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "iksolver"=.\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
-
-
diff --git a/intern/iksolver/make/msvc_7_0/iksolver.sln b/intern/iksolver/make/msvc_7_0/iksolver.sln deleted file mode 100644 index e06e5163993..00000000000 --- a/intern/iksolver/make/msvc_7_0/iksolver.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksolver", "iksolver.vcproj", "{EB6E6428-C3FA-4A95-91AE-F060EFD1D57C}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {EB6E6428-C3FA-4A95-91AE-F060EFD1D57C}.Debug.ActiveCfg = Debug|Win32 - {EB6E6428-C3FA-4A95-91AE-F060EFD1D57C}.Debug.Build.0 = Debug|Win32 - {EB6E6428-C3FA-4A95-91AE-F060EFD1D57C}.Release.ActiveCfg = Release|Win32 - {EB6E6428-C3FA-4A95-91AE-F060EFD1D57C}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/iksolver/make/msvc_7_0/iksolver.vcproj b/intern/iksolver/make/msvc_7_0/iksolver.vcproj deleted file mode 100644 index 008a29774dc..00000000000 --- a/intern/iksolver/make/msvc_7_0/iksolver.vcproj +++ /dev/null @@ -1,370 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="iksolver" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\iksolver\iksolver.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\iksolver\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\iksolver\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\iksolver\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libiksolver.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying IK files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_7\intern\iksolver\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\iksolver\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\iksolver\debug\iksolver.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\iksolver\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\iksolver\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\iksolver\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libiksolver.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying IK files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_7\intern\iksolver\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\iksolver\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\iksolver.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libiksolver.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying IK files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_7\intern\iksolver\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\iksolver\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\..\build\msvc_7\intern\moto\include" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug\iksolver.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\iksolver\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libiksolver.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying IK files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_7\intern\iksolver\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\iksolver\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="intern" - Filter=""> - <File - RelativePath="..\..\intern\IK_QJacobian.cpp"> - </File> - <File - RelativePath="..\..\intern\IK_QJacobian.h"> - </File> - <File - RelativePath="..\..\intern\IK_QJacobianSolver.cpp"> - </File> - <File - RelativePath="..\..\intern\IK_QJacobianSolver.h"> - </File> - <File - RelativePath="..\..\intern\IK_QSegment.cpp"> - </File> - <File - RelativePath="..\..\intern\IK_QSegment.h"> - </File> - <File - RelativePath="..\..\intern\IK_QTask.cpp"> - </File> - <File - RelativePath="..\..\intern\IK_QTask.h"> - </File> - <File - RelativePath="..\..\intern\IK_Solver.cpp"> - </File> - <File - RelativePath="..\..\intern\MT_ExpMap.cpp"> - </File> - <File - RelativePath="..\..\intern\MT_ExpMap.h"> - </File> - <Filter - Name="TNT" - Filter=""> - <File - RelativePath="..\..\intern\TNT\cholesky.h"> - </File> - <File - RelativePath="..\..\intern\TNT\cmat.h"> - </File> - <File - RelativePath="..\..\intern\TNT\fcscmat.h"> - </File> - <File - RelativePath="..\..\intern\TNT\fmat.h"> - </File> - <File - RelativePath="..\..\intern\TNT\fortran.h"> - </File> - <File - RelativePath="..\..\intern\TNT\fspvec.h"> - </File> - <File - RelativePath="..\..\intern\TNT\index.h"> - </File> - <File - RelativePath="..\..\intern\TNT\lapack.h"> - </File> - <File - RelativePath="..\..\intern\TNT\lu.h"> - </File> - <File - RelativePath="..\..\intern\TNT\qr.h"> - </File> - <File - RelativePath="..\..\intern\TNT\region1d.h"> - </File> - <File - RelativePath="..\..\intern\TNT\region2d.h"> - </File> - <File - RelativePath="..\..\intern\TNT\stopwatch.h"> - </File> - <File - RelativePath="..\..\intern\TNT\subscript.h"> - </File> - <File - RelativePath="..\..\intern\TNT\svd.h"> - </File> - <File - RelativePath="..\..\intern\TNT\tnt.h"> - </File> - <File - RelativePath="..\..\intern\TNT\tntmath.h"> - </File> - <File - RelativePath="..\..\intern\TNT\tntreqs.h"> - </File> - <File - RelativePath="..\..\intern\TNT\transv.h"> - </File> - <File - RelativePath="..\..\intern\TNT\triang.h"> - </File> - <File - RelativePath="..\..\intern\TNT\trisolve.h"> - </File> - <File - RelativePath="..\..\intern\TNT\vec.h"> - </File> - <File - RelativePath="..\..\intern\TNT\vecadaptor.h"> - </File> - <File - RelativePath="..\..\intern\TNT\version.h"> - </File> - </Filter> - </Filter> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\extern\IK_solver.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/iksolver/make/msvc_9_0/iksolver.vcproj b/intern/iksolver/make/msvc_9_0/iksolver.vcproj deleted file mode 100644 index 296a23e57cc..00000000000 --- a/intern/iksolver/make/msvc_9_0/iksolver.vcproj +++ /dev/null @@ -1,488 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_iksolver"
- ProjectGUID="{542A9FA1-B7FF-441C-AE15-054DB31D3488}"
- RootNamespace="iksolver"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\iksolver\iksolver.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\iksolver\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\iksolver\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\iksolver\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libiksolver.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_9\intern\iksolver\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\iksolver\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\iksolver\debug\iksolver.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\iksolver\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\iksolver\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\iksolver\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libiksolver.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_9\intern\iksolver\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\iksolver\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\iksolver.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libiksolver.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_9\intern\iksolver\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\iksolver\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\moto\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug\iksolver.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\iksolver\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libiksolver.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\iksolver\include MKDIR ..\..\..\..\..\build\msvc_9\intern\iksolver\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\iksolver\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\IK_QJacobian.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QJacobian.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QJacobianSolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QJacobianSolver.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QSegment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QSegment.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QTask.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_QTask.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\IK_Solver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\MT_ExpMap.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\MT_ExpMap.h"
- >
- </File>
- <Filter
- Name="TNT"
- >
- <File
- RelativePath="..\..\intern\TNT\cholesky.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\cmat.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\fcscmat.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\fmat.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\fortran.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\fspvec.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\index.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\lapack.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\lu.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\qr.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\region1d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\region2d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\stopwatch.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\subscript.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\svd.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\tnt.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\tntmath.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\tntreqs.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\transv.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\triang.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\trisolve.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\vec.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\vecadaptor.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\TNT\version.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\extern\IK_solver.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/iksolver/test/Makefile b/intern/iksolver/test/Makefile deleted file mode 100644 index ed867ba2a73..00000000000 --- a/intern/iksolver/test/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver test makefile. -# - -LIBNAME = iksolver -SOURCEDIR = intern/$(LIBNAME)/test -DIR = $(OCGDIR)/$(SOURCEDIR) - -include nan_compile.mk - -DIRS = ik_glut_test - -include nan_subdirs.mk - -include nan_link.mk - -LIBS = $(OCGDIR)/intern/$(LIBNAME)/test/ik_glut_test/intern/$(DEBUG_DIR)libintern.a -LIBS += $(OCGDIR)/intern/$(LIBNAME)/test/ik_glut_test/common/$(DEBUG_DIR)libcommon.a -LIBS += $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)libiksolver.a - -SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a - -ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd")) - LLIBS = -L/usr/X11R6/lib -lglut -pthread -endif - -ifeq ($(OS),$(findstring $(OS), "solaris")) - LLIBS = -L/usr/openwin/lib -lglut -lX11 -lGL -lGLU -lXmu -endif - -all debug:: $(LIBS) $(DIR)/$(DEBUG_DIR)iksolvertest - -$(DIR)/$(DEBUG_DIR)iksolvertest: - @echo "****> linking $@ in $(DIR)" - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)iksolvertest $(LIBS) $(SLIBS) $(LLIBS) $(DADD) - -clean:: - $(RM) $(DIR)/iksolvertest $(DIR)/debug/iksolvertest - -test:: all - $(DIR)/iksolvertest - diff --git a/intern/iksolver/test/ik_glut_test/Makefile b/intern/iksolver/test/ik_glut_test/Makefile deleted file mode 100644 index 55f7d9ee659..00000000000 --- a/intern/iksolver/test/ik_glut_test/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver subdir bouncer. Pure waste. -# - -include nan_definitions.mk - -LIBNAME = ik_glut_test -SOURCEDIR = intern/iksolver/test/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = common intern - -include nan_subdirs.mk - diff --git a/intern/iksolver/test/ik_glut_test/common/Makefile b/intern/iksolver/test/ik_glut_test/common/Makefile deleted file mode 100644 index df0286040cd..00000000000 --- a/intern/iksolver/test/ik_glut_test/common/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver test intern Makefile -# - -LIBNAME = common -SOURCEDIR = intern/iksolver/test/ik_glut_test/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include - diff --git a/intern/iksolver/test/ik_glut_test/intern/Makefile b/intern/iksolver/test/ik_glut_test/intern/Makefile deleted file mode 100644 index 8bb1d0ccd36..00000000000 --- a/intern/iksolver/test/ik_glut_test/intern/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver test intern Makefile -# - -LIBNAME = intern -SOURCEDIR = intern/iksolver/test/ik_glut_test/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I../../../extern -CPPFLAGS += -I../common -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_MEMUTIL)/include - -ifeq ($(OS),windows) - CPPFLAGS += -I$(NAN_LIBDIR)/windows/glut-3.7/include -endif - diff --git a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp deleted file mode 100644 index 2de994d12e3..00000000000 --- a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsp +++ /dev/null @@ -1,130 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ik_glut_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ik_glut_test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ik_glut_test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ik_glut_test.mak" CFG="ik_glut_test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ik_glut_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ik_glut_test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ik_glut_test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 iksolver_rmtd.lib libmoto.a /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib\windows\release" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib"
-
-!ELSEIF "$(CFG)" == "ik_glut_test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\extern" /I "..\..\..\..\..\..\lib\windows\glut-3.7\include" /I "..\..\..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\..\..\lib\windows\memutil\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 iksolver_dmtd.lib libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\debug" /libpath:"..\..\..\..\..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\..\..\..\..\lib\windows\moto\lib\debug"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ik_glut_test - Win32 Release"
-# Name "ik_glut_test - Win32 Debug"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\GlutDrawer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutDrawer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutKeyboardManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutKeyboardManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutMouseManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\GlutMouseManager.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\intern\ChainDrawer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MyGlutKeyHandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MyGlutMouseHandler.h
-# End Source File
-# End Target
-# End Project
diff --git a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw b/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw deleted file mode 100644 index 84915beaeb2..00000000000 --- a/intern/iksolver/test/ik_glut_test/make/msvc_6_0/ik_glut_test.dsw +++ /dev/null @@ -1,49 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ik_glut_test"=.\ik_glut_test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name iksolver
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "iksolver"=..\..\..\..\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-
-
-
-
-
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 88f902b38c8..a0489c48144 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -24,8 +24,202 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ../../extern/Eigen2) +set(INC + ../../extern/Eigen2 +) -FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp) +set(SRC + Armature.cpp + Cache.cpp + ConstraintSet.cpp + ControlledObject.cpp + CopyPose.cpp + Distance.cpp + FixedObject.cpp + MovingFrame.cpp + Scene.cpp + UncontrolledObject.cpp + WDLSSolver.cpp + WSDLSSolver.cpp + WorldObject.cpp + eigen_types.cpp + kdl/chain.cpp + kdl/chainfksolverpos_recursive.cpp + kdl/chainjnttojacsolver.cpp + kdl/frameacc.cpp + kdl/frames.cpp + kdl/frames_io.cpp + kdl/framevel.cpp + kdl/inertia.cpp + kdl/jacobian.cpp + kdl/jntarray.cpp + kdl/jntarrayacc.cpp + kdl/jntarrayvel.cpp + kdl/joint.cpp + kdl/kinfam_io.cpp + kdl/segment.cpp + kdl/tree.cpp + kdl/treefksolverpos_recursive.cpp + kdl/treejnttojacsolver.cpp + kdl/utilities/error_stack.cpp + kdl/utilities/utility.cpp + kdl/utilities/utility_io.cpp -BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}") + Armature.hpp + Cache.hpp + ConstraintSet.hpp + ControlledObject.hpp + CopyPose.hpp + Distance.hpp + FixedObject.hpp + MovingFrame.hpp + Object.hpp + Scene.hpp + Solver.hpp + UncontrolledObject.hpp + WDLSSolver.hpp + WSDLSSolver.hpp + WorldObject.hpp + eigen_types.hpp + kdl/chain.hpp + kdl/chainfksolver.hpp + kdl/chainfksolverpos_recursive.hpp + kdl/chainjnttojacsolver.hpp + kdl/frameacc.hpp + kdl/frames.hpp + kdl/frames_io.hpp + kdl/framevel.hpp + kdl/inertia.hpp + kdl/jacobian.hpp + kdl/jntarray.hpp + kdl/jntarrayacc.hpp + kdl/jntarrayvel.hpp + kdl/joint.hpp + kdl/kinfam_io.hpp + kdl/segment.hpp + kdl/tree.hpp + kdl/treefksolver.hpp + kdl/treefksolverpos_recursive.hpp + kdl/treejnttojacsolver.hpp + kdl/utilities/error.h + kdl/utilities/error_stack.h + kdl/utilities/kdl-config.h + kdl/utilities/rall1d.h + kdl/utilities/rall2d.h + kdl/utilities/svd_eigen_HH.hpp + kdl/utilities/traits.h + kdl/utilities/utility.h + kdl/utilities/utility_io.h + ublas_types.hpp + + # until we have another user... + ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h + ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h + ../../extern/Eigen2/Eigen/src/Array/Functors.h + ../../extern/Eigen2/Eigen/src/Array/Norms.h + ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h + ../../extern/Eigen2/Eigen/src/Array/Random.h + ../../extern/Eigen2/Eigen/src/Array/Select.h + ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h + ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h + ../../extern/Eigen2/Eigen/src/Core/Assign.h + ../../extern/Eigen2/Eigen/src/Core/Block.h + ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h + ../../extern/Eigen2/Eigen/src/Core/Coeffs.h + ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h + ../../extern/Eigen2/Eigen/src/Core/Cwise.h + ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h + ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h + ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h + ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h + ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h + ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h + ../../extern/Eigen2/Eigen/src/Core/Dot.h + ../../extern/Eigen2/Eigen/src/Core/Flagged.h + ../../extern/Eigen2/Eigen/src/Core/Functors.h + ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h + ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h + ../../extern/Eigen2/Eigen/src/Core/IO.h + ../../extern/Eigen2/Eigen/src/Core/Map.h + ../../extern/Eigen2/Eigen/src/Core/MapBase.h + ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h + ../../extern/Eigen2/Eigen/src/Core/Matrix.h + ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h + ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h + ../../extern/Eigen2/Eigen/src/Core/Minor.h + ../../extern/Eigen2/Eigen/src/Core/NestByValue.h + ../../extern/Eigen2/Eigen/src/Core/NumTraits.h + ../../extern/Eigen2/Eigen/src/Core/Part.h + ../../extern/Eigen2/Eigen/src/Core/Product.h + ../../extern/Eigen2/Eigen/src/Core/Redux.h + ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h + ../../extern/Eigen2/Eigen/src/Core/Sum.h + ../../extern/Eigen2/Eigen/src/Core/Swap.h + ../../extern/Eigen2/Eigen/src/Core/Transpose.h + ../../extern/Eigen2/Eigen/src/Core/Visitor.h + ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h + ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h + ../../extern/Eigen2/Eigen/src/Core/util/Constants.h + ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h + ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h + ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h + ../../extern/Eigen2/Eigen/src/Core/util/Macros.h + ../../extern/Eigen2/Eigen/src/Core/util/Memory.h + ../../extern/Eigen2/Eigen/src/Core/util/Meta.h + ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h + ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h + ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h + ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h + ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h + ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h + ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h + ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h + ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h + ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h + ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h + ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h + ../../extern/Eigen2/Eigen/src/Geometry/Transform.h + ../../extern/Eigen2/Eigen/src/Geometry/Translation.h + ../../extern/Eigen2/Eigen/src/LU/Determinant.h + ../../extern/Eigen2/Eigen/src/LU/Inverse.h + ../../extern/Eigen2/Eigen/src/LU/LU.h + ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h + ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h + ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h + ../../extern/Eigen2/Eigen/src/QR/QR.h + ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h + ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h + ../../extern/Eigen2/Eigen/src/SVD/SVD.h + ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h + ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h + ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h + ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h + ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h + ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h + ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h + ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h + ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h + ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h + ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h + ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h +) + +blender_add_lib(bf_intern_itasc "${SRC}" "${INC}") diff --git a/intern/itasc/Makefile b/intern/itasc/Makefile deleted file mode 100644 index 2be46a017df..00000000000 --- a/intern/itasc/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver main makefile. -# - -include nan_definitions.mk - -LIBNAME = itasc -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = kdl -include nan_subdirs.mk -include nan_compile.mk - -CPPFLAGS += -I. -CPPFLAGS += -I../../extern/Eigen2 - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_ITASC) ] || mkdir $(NAN_ITASC) - @[ -d $(NAN_ITASC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ITASC)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libitasc.a $(DIR)/$(DEBUG_DIR)libitasc_kdl.a $(DIR)/$(DEBUG_DIR)libitasc_kdl_util.a $(NAN_ITASC)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a - ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a - ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.a -endif -############################## -include nan_subdirs.mk diff --git a/intern/itasc/kdl/Makefile b/intern/itasc/kdl/Makefile deleted file mode 100644 index 058f93da4e1..00000000000 --- a/intern/itasc/kdl/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver main makefile. -# - -include nan_definitions.mk - -LIBNAME = itasc_kdl -# Yep, same dir than parent (itasc instead of $(LIBNAME)) -DIR = $(OCGDIR)/intern/itasc -DIRS = utilities -SOURCEDIR = intern/$(LIBNAME)/kdl - -include nan_subdirs.mk -include nan_compile.mk - -CPPFLAGS += -I. -CPPFLAGS += -I../../../extern/Eigen2 diff --git a/intern/itasc/kdl/utilities/Makefile b/intern/itasc/kdl/utilities/Makefile deleted file mode 100644 index 8ee08089e10..00000000000 --- a/intern/itasc/kdl/utilities/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont -# -# ***** END GPL LICENSE BLOCK ***** -# iksolver main makefile. -# - -include nan_definitions.mk - -LIBNAME = itasc_kdl_util -# Same dir than parent (itasc instead of $(LIBNAME)) -DIR = $(OCGDIR)/intern/itasc - -include nan_compile.mk - -CPPFLAGS += -I. -CPPFLAGS += -I../../../../extern/Eigen2 diff --git a/intern/itasc/make/msvc_9_0/itasc.vcproj b/intern/itasc/make/msvc_9_0/itasc.vcproj deleted file mode 100644 index f4a81079da0..00000000000 --- a/intern/itasc/make/msvc_9_0/itasc.vcproj +++ /dev/null @@ -1,539 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_itasc"
- ProjectGUID="{59567A5B-F63A-4A5C-B33A-0A45C300F4DC}"
- RootNamespace="itasc"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\itasc\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\itasc\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\extern\Eigen2"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\itasc\debug\itasc.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\itasc\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\itasc\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\itasc\debug\"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libitasc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\itasc"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\itasc"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\..\extern\Eigen2"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
- UsePrecompiledHeader="0"
- AssemblerListingLocation="$(IntDir)\"
- WarningLevel="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libitasc.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="kdl"
- >
- <Filter
- Name="Header Files"
- >
- <File
- RelativePath="..\..\kdl\chain.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\chainfksolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\chainfksolverpos_recursive.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\chainjnttojacsolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frameacc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frameacc.inl"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frames.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frames.inl"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frames_io.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\framevel.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\framevel.inl"
- >
- </File>
- <File
- RelativePath="..\..\kdl\inertia.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jacobian.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarray.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarrayacc.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarrayvel.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\joint.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\kinfam_io.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\segment.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\tree.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\treefksolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\treefksolverpos_recursive.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\treejnttojacsolver.hpp"
- >
- </File>
- <Filter
- Name="Utilities"
- >
- <File
- RelativePath="..\..\kdl\utilities\error.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\error_stack.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\kdl-config.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\rall1d.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\rall2d.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\svd_eigen_HH.hpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\traits.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\utility.h"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\utility_io.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Source Files"
- >
- <File
- RelativePath="..\..\kdl\chain.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\chainfksolverpos_recursive.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\chainjnttojacsolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frameacc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frames.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\frames_io.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\framevel.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\inertia.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jacobian.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarray.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarrayacc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\jntarrayvel.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\joint.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\kinfam_io.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\segment.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\tree.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\treefksolverpos_recursive.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\treejnttojacsolver.cpp"
- >
- </File>
- <Filter
- Name="Utilities"
- >
- <File
- RelativePath="..\..\kdl\utilities\error_stack.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\utility.cpp"
- >
- </File>
- <File
- RelativePath="..\..\kdl\utilities\utility_io.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Filter>
- <Filter
- Name="itasc"
- >
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\Armature.hpp"
- >
- </File>
- <File
- RelativePath="..\..\Cache.hpp"
- >
- </File>
- <File
- RelativePath="..\..\ConstraintSet.hpp"
- >
- </File>
- <File
- RelativePath="..\..\ControlledObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\CopyPose.hpp"
- >
- </File>
- <File
- RelativePath="..\..\Distance.hpp"
- >
- </File>
- <File
- RelativePath="..\..\eigen_types.hpp"
- >
- </File>
- <File
- RelativePath="..\..\FixedObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\MovingFrame.hpp"
- >
- </File>
- <File
- RelativePath="..\..\Object.hpp"
- >
- </File>
- <File
- RelativePath="..\..\Scene.hpp"
- >
- </File>
- <File
- RelativePath="..\..\Solver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\UncontrolledObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\WDLSSolver.hpp"
- >
- </File>
- <File
- RelativePath="..\..\WorldObject.hpp"
- >
- </File>
- <File
- RelativePath="..\..\WSDLSSolver.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\Armature.cpp"
- >
- </File>
- <File
- RelativePath="..\..\Cache.cpp"
- >
- </File>
- <File
- RelativePath="..\..\ConstraintSet.cpp"
- >
- </File>
- <File
- RelativePath="..\..\ControlledObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\CopyPose.cpp"
- >
- </File>
- <File
- RelativePath="..\..\Distance.cpp"
- >
- </File>
- <File
- RelativePath="..\..\eigen_types.cpp"
- >
- </File>
- <File
- RelativePath="..\..\FixedObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\MovingFrame.cpp"
- >
- </File>
- <File
- RelativePath="..\..\Scene.cpp"
- >
- </File>
- <File
- RelativePath="..\..\UncontrolledObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\WDLSSolver.cpp"
- >
- </File>
- <File
- RelativePath="..\..\WorldObject.cpp"
- >
- </File>
- <File
- RelativePath="..\..\WSDLSSolver.cpp"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/make/msvc_6_0/build_install_all.dsp b/intern/make/msvc_6_0/build_install_all.dsp deleted file mode 100644 index 714c30fc5cf..00000000000 --- a/intern/make/msvc_6_0/build_install_all.dsp +++ /dev/null @@ -1,68 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Build_install_all" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a
-
-CFG=Build_install_all - Win32 Debug
-!MESSAGE This is not a valid makefile. To Build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Build_install_all.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Build_install_all.mak" CFG="Build_install_all - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Build_install_all - Win32 Release" (based on "Win32 (x86) Generic Project")
-!MESSAGE "Build_install_all - Win32 Debug" (based on "Win32 (x86) Generic Project")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-MTL=midl.exe
-
-!IF "$(CFG)" == "Build_install_all - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-
-!ELSEIF "$(CFG)" == "Build_install_all - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Python freeze
-PostBuild_Cmds=ECHO Freezing Blender Python code ..\..\python\freeze\freeze.bat
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "Build_install_all - Win32 Release"
-# Name "Build_install_all - Win32 Debug"
-# End Target
-# End Project
diff --git a/intern/make/msvc_6_0/intern.dsw b/intern/make/msvc_6_0/intern.dsw deleted file mode 100644 index 1f37f3c618a..00000000000 --- a/intern/make/msvc_6_0/intern.dsw +++ /dev/null @@ -1,302 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Build_install_all"=.\build_install_all.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name OpenNL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name bmfont
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name bsplib
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name container
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name decimation
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name DummySoundSystem
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ghost
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name guardedalloc
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name iksolver
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name memutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name MoTo
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name SoundSystem
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name string
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name elbeem
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name boolop
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name OpenALSoundSystem
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "DummySoundSystem"=..\..\SoundSystem\make\msvc_6_0\dummy\DummySoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "MoTo"=..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "OpenALSoundSystem"=..\..\SoundSystem\make\msvc_6_0\openal\OpenALSoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "OpenNL"=..\..\opennl\make\msvc_6_0\OpenNL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SoundSystem"=..\..\SoundSystem\make\msvc_6_0\SoundSystem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bmfont"=..\..\bmfont\make\msvc_6_0\bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "boolop"=..\..\boolop\make\msvc_6_0\boolop.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bsplib"=..\..\bsp\make\msvc6_0\bsplib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name container
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name memutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name MoTo
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "container"=..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "csg"=..\..\csg\make\msvc60\csg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "decimation"=..\..\decimation\make\msvc_6_0\decimation.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name memutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name MoTo
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name container
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "elbeem"=..\..\elbeem\make\msvc_6_0\elbeem.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ghost"=..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name string
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "guardedalloc"=..\..\guardedalloc\make\msvc_6_0\guardedalloc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "iksolver"=..\..\iksolver\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "memutil"=..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "string"=..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/make/msvc_7_0/build_install_all.vcproj b/intern/make/msvc_7_0/build_install_all.vcproj deleted file mode 100644 index 3d80bd48b8b..00000000000 --- a/intern/make/msvc_7_0/build_install_all.vcproj +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="build_install_all" - ProjectGUID="{02110D03-59DB-4571-8787-72B3C03B2F2D}" - SccProjectName="" - SccLocalPath="" - Keyword="MakeFileProj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\build\msvc_7\intern\debug" - IntermediateDirectory="..\..\..\..\build\msvc_7\intern\debug" - ConfigurationType="10" - UseOfMFC="0"> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - ExcludedFromBuild="FALSE"/> - <Tool - Name="VCPreBuildEventTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_7\intern" - IntermediateDirectory="..\..\..\..\build\msvc_7\intern" - ConfigurationType="10" - UseOfMFC="0"> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\build\msvc_7\intern\mtdll" - IntermediateDirectory="..\..\..\..\build\msvc_7\intern\mtdll" - ConfigurationType="10" - UseOfMFC="0"> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\build\msvc_7\intern\mtdll\debug" - IntermediateDirectory="..\..\..\..\build\msvc_7\intern\mtdll\debug" - ConfigurationType="10" - UseOfMFC="0"> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - ExcludedFromBuild="FALSE"/> - <Tool - Name="VCPreBuildEventTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/make/msvc_7_0/intern.sln b/intern/make/msvc_7_0/intern.sln deleted file mode 100644 index 5fdb4ca95d0..00000000000 --- a/intern/make/msvc_7_0/intern.sln +++ /dev/null @@ -1,252 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all", "build_install_all.vcproj", "{02110D03-59DB-4571-8787-72B3C03B2F2D}" - ProjectSection(ProjectDependencies) = postProject - {A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9} - {98330220-47A6-42E0-9DE4-AD0FF5D204D6} = {98330220-47A6-42E0-9DE4-AD0FF5D204D6} - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} - {FAF46346-65CC-4DB2-85C4-B99826F79D0C} = {FAF46346-65CC-4DB2-85C4-B99826F79D0C} - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E} = {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E} - {E784098D-3ED8-433A-9353-9679415DDDC5} = {E784098D-3ED8-433A-9353-9679415DDDC5} - {76D90B92-ECC7-409C-9F98-A8814B90F3C0} = {76D90B92-ECC7-409C-9F98-A8814B90F3C0} - {542A9FA1-B7FF-441C-AE15-054DB31D3488} = {542A9FA1-B7FF-441C-AE15-054DB31D3488} - {213356A9-3A1F-41DA-9819-1297BCD17DEE} = {213356A9-3A1F-41DA-9819-1297BCD17DEE} - {51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B} - {8B8D4FC3-3234-4E54-8376-5AB83D00D164} = {8B8D4FC3-3234-4E54-8376-5AB83D00D164} - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9} = {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9} - {E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538} - {B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598} - {6B3229F4-2A37-47EE-8B89-9AA046B35193} = {6B3229F4-2A37-47EE-8B89-9AA046B35193} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoTo", "..\..\moto\make\msvc_7_0\MoTo.vcproj", "{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmfont", "..\..\bmfont\make\msvc_7_0\bmfont.vcproj", "{E784098D-3ED8-433A-9353-9679415DDDC5}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsplib", "..\..\bsp\make\msvc_7_0\bsplib.vcproj", "{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}" - ProjectSection(ProjectDependencies) = postProject - {51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B} - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} - {E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "container", "..\..\container\make\msvc_7_0\container.vcproj", "{51A348C1-8684-4D67-B980-97B1FC74159B}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decimation", "..\..\decimation\make\msvc_7_0\decimation.vcproj", "{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}" - ProjectSection(ProjectDependencies) = postProject - {51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B} - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} - {E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghost", "..\..\ghost\make\msvc_7_0\ghost.vcproj", "{76D90B92-ECC7-409C-9F98-A8814B90F3C0}" - ProjectSection(ProjectDependencies) = postProject - {B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guardedalloc", "..\..\guardedalloc\make\msvc_7_0\guardedalloc.vcproj", "{6B3229F4-2A37-47EE-8B89-9AA046B35193}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksolver", "..\..\iksolver\make\msvc_7_0\iksolver.vcproj", "{542A9FA1-B7FF-441C-AE15-054DB31D3488}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memutil", "..\..\memutil\make\msvc_7_0\memutil.vcproj", "{E86B7BDE-C33C-4E55-9433-E74C141D7538}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "..\..\string\make\msvc_7_0\string.vcproj", "{B789C2F3-279E-4A85-8F0A-7F7AC068E598}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundSystem", "..\..\SoundSystem\make\msvc_7_0\SoundSystem.vcproj", "{98330220-47A6-42E0-9DE4-AD0FF5D204D6}" - ProjectSection(ProjectDependencies) = postProject - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} - {B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598} - {6B3229F4-2A37-47EE-8B89-9AA046B35193} = {6B3229F4-2A37-47EE-8B89-9AA046B35193} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenALSoundSystem", "..\..\SoundSystem\make\msvc_7_0\openal\OpenALSoundSystem.vcproj", "{213356A9-3A1F-41DA-9819-1297BCD17DEE}" - ProjectSection(ProjectDependencies) = postProject - {98330220-47A6-42E0-9DE4-AD0FF5D204D6} = {98330220-47A6-42E0-9DE4-AD0FF5D204D6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DummySoundSystem", "..\..\SoundSystem\make\msvc_7_0\dummy\DummySoundSystem.vcproj", "{FAF46346-65CC-4DB2-85C4-B99826F79D0C}" - ProjectSection(ProjectDependencies) = postProject - {98330220-47A6-42E0-9DE4-AD0FF5D204D6} = {98330220-47A6-42E0-9DE4-AD0FF5D204D6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opennl", "..\..\opennl\make\msvc_7_0\opennl.vcproj", "{8B8D4FC3-3234-4E54-8376-5AB83D00D164}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elbeem", "..\..\elbeem\make\msvc_7_0\elbeem.vcproj", "{A90C4918-4B21-4277-93BD-AF65F30951D9}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolop", "..\..\boolop\make\msvc_7_0\boolop.vcproj", "{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}" - ProjectSection(ProjectDependencies) = postProject - {51A348C1-8684-4D67-B980-97B1FC74159B} = {51A348C1-8684-4D67-B980-97B1FC74159B} - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} - {E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - 3DPlugin Debug = 3DPlugin Debug - 3DPlugin Release = 3DPlugin Release - Blender Debug = Blender Debug - Blender Release = Blender Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Debug.Build.0 = Blender Debug|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Release.ActiveCfg = Blender Release|Win32 - {02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Release.Build.0 = Blender Release|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Debug.Build.0 = Blender Debug|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Release.ActiveCfg = Blender Release|Win32 - {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Release.Build.0 = Blender Release|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Debug.Build.0 = Blender Debug|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release.ActiveCfg = Blender Release|Win32 - {E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release.Build.0 = Blender Release|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Debug.Build.0 = Blender Debug|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Release.ActiveCfg = Blender Release|Win32 - {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Release.Build.0 = Blender Release|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Debug.Build.0 = Blender Debug|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Release.ActiveCfg = Blender Release|Win32 - {51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Release.Build.0 = Blender Release|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Debug.Build.0 = Blender Debug|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Release.ActiveCfg = Blender Release|Win32 - {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.Blender Release.Build.0 = Blender Release|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug.Build.0 = Blender Debug|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release.ActiveCfg = Blender Release|Win32 - {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release.Build.0 = Blender Release|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Debug.Build.0 = Blender Debug|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Release.ActiveCfg = Blender Release|Win32 - {6B3229F4-2A37-47EE-8B89-9AA046B35193}.Blender Release.Build.0 = Blender Release|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Debug.Build.0 = Blender Debug|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Release.ActiveCfg = Blender Release|Win32 - {542A9FA1-B7FF-441C-AE15-054DB31D3488}.Blender Release.Build.0 = Blender Release|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Debug.Build.0 = Blender Debug|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Release.ActiveCfg = Blender Release|Win32 - {E86B7BDE-C33C-4E55-9433-E74C141D7538}.Blender Release.Build.0 = Blender Release|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Debug.Build.0 = Blender Debug|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Release.ActiveCfg = Blender Release|Win32 - {B789C2F3-279E-4A85-8F0A-7F7AC068E598}.Blender Release.Build.0 = Blender Release|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Debug.Build.0 = Blender Debug|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Release.ActiveCfg = Blender Release|Win32 - {98330220-47A6-42E0-9DE4-AD0FF5D204D6}.Blender Release.Build.0 = Blender Release|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Debug.Build.0 = Blender Debug|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Release.ActiveCfg = Blender Release|Win32 - {213356A9-3A1F-41DA-9819-1297BCD17DEE}.Blender Release.Build.0 = Blender Release|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Debug.Build.0 = Blender Debug|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Release.ActiveCfg = Blender Release|Win32 - {FAF46346-65CC-4DB2-85C4-B99826F79D0C}.Blender Release.Build.0 = Blender Release|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Debug.Build.0 = Blender Debug|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Release.ActiveCfg = Blender Release|Win32 - {8B8D4FC3-3234-4E54-8376-5AB83D00D164}.Blender Release.Build.0 = Blender Release|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.Blender Debug.Build.0 = Blender Debug|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.Blender Release.ActiveCfg = Blender Release|Win32 - {A90C4918-4B21-4277-93BD-AF65F30951D9}.Blender Release.Build.0 = Blender Release|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.3DPlugin Debug.ActiveCfg = 3DPlugin Debug|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.3DPlugin Debug.Build.0 = 3DPlugin Debug|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.3DPlugin Release.ActiveCfg = 3DPlugin Release|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.3DPlugin Release.Build.0 = 3DPlugin Release|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Debug.ActiveCfg = Blender Debug|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Debug.Build.0 = Blender Debug|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Release.ActiveCfg = Blender Release|Win32 - {EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Release.Build.0 = Blender Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/make/msvc_9_0/INT_build_install_all.vcproj b/intern/make/msvc_9_0/INT_build_install_all.vcproj deleted file mode 100644 index dbb58134b0f..00000000000 --- a/intern/make/msvc_9_0/INT_build_install_all.vcproj +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_build_install_all"
- ProjectGUID="{02110D03-59DB-4571-8787-72B3C03B2F2D}"
- Keyword="MakeFileProj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\intern\debug"
- IntermediateDirectory="..\..\..\..\build\msvc_9\intern\debug"
- ConfigurationType="10"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- ExcludedFromBuild="false"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\intern"
- IntermediateDirectory="..\..\..\..\build\msvc_9\intern"
- ConfigurationType="10"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\intern\mtdll"
- IntermediateDirectory="..\..\..\..\build\msvc_9\intern\mtdll"
- ConfigurationType="10"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\build\msvc_9\intern\mtdll\debug"
- IntermediateDirectory="..\..\..\..\build\msvc_9\intern\mtdll\debug"
- ConfigurationType="10"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- ExcludedFromBuild="false"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- </Files>
-</VisualStudioProject>
diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index ebbc53403f4..aecd3d5b6c9 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -24,11 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . ..) +set(INC + . + .. +) + +set(SRC + intern/MEM_CacheLimiterC-Api.cpp + intern/MEM_RefCountedC-Api.cpp -SET(SRC - ./intern/MEM_CacheLimiterC-Api.cpp - ./intern/MEM_RefCountedC-Api.cpp + MEM_Allocator.h + MEM_CacheLimiter.h + MEM_CacheLimiterC-Api.h + MEM_NonCopyable.h + MEM_RefCountPtr.h + MEM_RefCounted.h + MEM_RefCountedC-Api.h + MEM_SmartPtr.h ) -BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}") +blender_add_lib(bf_intern_memutil "${SRC}" "${INC}") diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index 925b6b42318..56c5fc80035 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -21,18 +21,12 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __MEM_Allocator_h_included__ -#define __MEM_Allocator_h_included__ 1 +#ifndef MEM_ALLOCATOR_H +#define MEM_ALLOCATOR_H #include "guardedalloc/MEM_guardedalloc.h" #include "guardedalloc/BLO_sys_types.h" -#ifdef _MSC_VER -#if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost -#define MS_VISUALC_6_0_WORKAROUND 1 -#endif -#endif - template<typename _Tp> struct MEM_Allocator { @@ -44,20 +38,16 @@ struct MEM_Allocator typedef const _Tp& const_reference; typedef _Tp value_type; -#ifndef MS_VISUALC_6_0_WORKAROUND template<typename _Tp1> struct rebind { typedef MEM_Allocator<_Tp1> other; }; -#endif MEM_Allocator() throw() {} MEM_Allocator(const MEM_Allocator&) throw() {} -#ifndef MS_VISUALC_6_0_WORKAROUND template<typename _Tp1> MEM_Allocator(const MEM_Allocator<_Tp1>) throw() { } -#endif ~MEM_Allocator() throw() {} @@ -65,11 +55,6 @@ struct MEM_Allocator const_pointer address(const_reference __x) const { return &__x; } -#ifdef MS_VISUALC_6_0_WORKAROUND - char *_Charalloc(size_type n) { - return (char *) MEM_mallocN(n, "STL MEM_Allocator VC6.0"); - } -#endif // NB: __n is permitted to be 0. The C++ standard says nothing // about what the return value is when __n == 0. _Tp* allocate(size_type __n, const void* = 0) { @@ -81,17 +66,10 @@ struct MEM_Allocator return __ret; } -#ifndef MS_VISUALC_6_0_WORKAROUND // __p is not permitted to be a null pointer. void deallocate(pointer __p, size_type){ MEM_freeN(__p); } -#else - // __p is not permitted to be a null pointer. - void deallocate(void* __p, size_type){ - MEM_freeN(__p); - } -#endif size_type max_size() const throw() { return size_t(-1) / sizeof(_Tp); @@ -106,4 +84,4 @@ struct MEM_Allocator } }; -#endif +#endif // MEM_ALLOCATOR_H diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index 0a7ac8d6629..b90c5db1b4f 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -21,8 +21,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __MEM_cache_limiter_h_included__ -#define __MEM_cache_limiter_h_included__ 1 +#ifndef MEM_CACHELIMITER_H +#define MEM_CACHELIMITER_H /** * @section MEM_CacheLimiter @@ -164,4 +164,4 @@ private: MEM_Allocator<MEM_CacheLimiterHandle<T> *> > queue; }; -#endif +#endif // MEM_CACHELIMITER_H diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h index 898625a9563..4116d05e42f 100644 --- a/intern/memutil/MEM_CacheLimiterC-Api.h +++ b/intern/memutil/MEM_CacheLimiterC-Api.h @@ -21,8 +21,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __MEM_cache_limiter_c_api_h_included__ -#define __MEM_cache_limiter_c_api_h_included__ 1 +#ifndef MEM_CACHELIMITERC_API_H +#define MEM_CACHELIMITERC_API_H #ifdef __cplusplus extern "C" { @@ -37,10 +37,10 @@ typedef struct MEM_CacheLimiterHandle_s MEM_CacheLimiterHandleC; /* function used to remove data from memory */ typedef void(*MEM_CacheLimiter_Destruct_Func)(void*); -#ifndef __MEM_cache_limiter_h_included__ +#ifndef MEM_CACHELIMITER_H extern void MEM_CacheLimiter_set_maximum(int m); -extern int MEM_CacheLimiter_get_maximum(); -#endif +extern int MEM_CacheLimiter_get_maximum(void); +#endif // MEM_CACHELIMITER_H /** * Create new MEM_CacheLimiter object * managed objects are destructed with the data_destructor @@ -137,5 +137,4 @@ extern void * MEM_CacheLimiter_get(MEM_CacheLimiterHandleC * handle); #endif -#endif - +#endif // MEM_CACHELIMITERC_API_H diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h index e369aa122e6..64aceef6f3c 100644 --- a/intern/memutil/MEM_RefCounted.h +++ b/intern/memutil/MEM_RefCounted.h @@ -30,8 +30,8 @@ * Declaration of MEM_RefCounted class. */ -#ifndef _H_MEM_REF_COUNTED -#define _H_MEM_REF_COUNTED +#ifndef MEM_REFCOUNTED_H +#define MEM_REFCOUNTED_H /** * An object with reference counting. @@ -108,5 +108,5 @@ inline int MEM_RefCounted::decRef() return m_refCount; } -#endif // _H_MEM_REF_COUNTED +#endif // MEM_REFCOUNTED_H diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h index 387c00afbf1..900b5083e09 100644 --- a/intern/memutil/MEM_RefCountedC-Api.h +++ b/intern/memutil/MEM_RefCountedC-Api.h @@ -30,8 +30,8 @@ * Interface for C access to functionality relating to shared objects in the foundation library. */ -#ifndef _H_MEM_REF_COUNTED_C_API -#define _H_MEM_REF_COUNTED_C_API +#ifndef MEM_REFCOUNTEDC_API_H +#define MEM_REFCOUNTEDC_API_H /** A pointer to a private object. */ typedef struct MEM_TOpaqueObject* MEM_TObjectPtr; @@ -71,5 +71,4 @@ extern int MEM_RefCountedDecRef(MEM_TRefCountedObjectPtr shared); } #endif -#endif // _H_MEM_REF_COUNTED_C_API - +#endif // MEM_REFCOUNTEDC_API_H diff --git a/intern/memutil/Makefile b/intern/memutil/Makefile deleted file mode 100644 index 50aa0528f31..00000000000 --- a/intern/memutil/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# memutil main makefile. -# - -include nan_definitions.mk - -LIBNAME = memutil -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_MEMUTIL) ] || mkdir $(NAN_MEMUTIL) - @[ -d $(NAN_MEMUTIL)/include ] || mkdir $(NAN_MEMUTIL)/include - @[ -d $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmemutil.a $(NAN_MEMUTIL)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_MEMUTIL)/lib/$(DEBUG_DIR)libmemutil.a -endif - @../tools/cpifdiff.sh *.h $(NAN_MEMUTIL)/include/ - diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp index 50700e39203..e8f11957c74 100644 --- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp +++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp @@ -20,6 +20,8 @@ * */ +#include <cstddef> + #include "MEM_CacheLimiter.h" #include "MEM_CacheLimiterC-Api.h" diff --git a/intern/memutil/intern/Makefile b/intern/memutil/intern/Makefile deleted file mode 100644 index b77c2310b75..00000000000 --- a/intern/memutil/intern/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# memutil intern Makefile -# - -LIBNAME = memutil -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I.. -I../.. - diff --git a/intern/memutil/make/msvc_60/memutil.dsp b/intern/memutil/make/msvc_60/memutil.dsp deleted file mode 100644 index b7e7904e9bf..00000000000 --- a/intern/memutil/make/msvc_60/memutil.dsp +++ /dev/null @@ -1,150 +0,0 @@ -# Microsoft Developer Studio Project File - Name="memutil" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=memutil - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "memutil.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "memutil.mak" CFG="memutil - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "memutil - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "memutil - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "memutil - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\*.lib ..\..\..\..\..\lib\windows\memutil\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "memutil - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\memutil\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\memutil\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\*.lib ..\..\..\..\..\lib\windows\memutil\lib\debug\*.a ECHO Copying Debug info. XCOPY /Y ..\..\..\..\obj\windows\intern\memutil\debug\vc60.* ..\..\..\..\..\lib\windows\memutil\lib\debug\ ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "memutil - Win32 Release"
-# Name "memutil - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\MEM_Allocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_CacheLimiter.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\MEM_CacheLimiterC-Api.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\guardedalloc\MEM_guardedalloc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\intern\MEM_RefCountedC-Api.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\MEM_NonCopyable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_RefCounted.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\MEM_RefCountedC-Api.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_RefCountPtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MEM_SmartPtr.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/intern/memutil/make/msvc_60/memutil.dsw b/intern/memutil/make/msvc_60/memutil.dsw deleted file mode 100644 index 3c19a94c701..00000000000 --- a/intern/memutil/make/msvc_60/memutil.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "memutil"=".\memutil.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/memutil/make/msvc_7_0/memutil.sln b/intern/memutil/make/msvc_7_0/memutil.sln deleted file mode 100644 index 462cd1a3871..00000000000 --- a/intern/memutil/make/msvc_7_0/memutil.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memutil", "memutil.vcproj", "{8B8B95BA-3084-408F-8EE6-3FE6EF52E112}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {8B8B95BA-3084-408F-8EE6-3FE6EF52E112}.Debug.ActiveCfg = Debug|Win32 - {8B8B95BA-3084-408F-8EE6-3FE6EF52E112}.Debug.Build.0 = Debug|Win32 - {8B8B95BA-3084-408F-8EE6-3FE6EF52E112}.Release.ActiveCfg = Release|Win32 - {8B8B95BA-3084-408F-8EE6-3FE6EF52E112}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/memutil/make/msvc_7_0/memutil.vcproj b/intern/memutil/make/msvc_7_0/memutil.vcproj deleted file mode 100644 index 2d570ea3d49..00000000000 --- a/intern/memutil/make/msvc_7_0/memutil.vcproj +++ /dev/null @@ -1,292 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="memutil" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\memutil\debug\memutil.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\memutil\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\memutil\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\memutil\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\memutil.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_7\intern\memutil\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\memutil\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\memutil" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\memutil" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\memutil\memutil.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\memutil\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\memutil\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\memutil\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\memutil.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_7\intern\memutil\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\memutil\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\memutil.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\memutil.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_7\intern\memutil\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\memutil\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug\memutil.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\memutil\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\memutil.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MEM files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_7\intern\memutil\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\memutil\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\..\intern\MEM_CacheLimiterC-Api.cpp"> - </File> - <File - RelativePath="..\..\intern\MEM_RefCountedC-Api.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="..\..\MEM_Allocator.h"> - </File> - <File - RelativePath="..\..\MEM_CacheLimiter.h"> - </File> - <File - RelativePath="..\..\MEM_CacheLimiterC-Api.h"> - </File> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\MEM_NonCopyable.h"> - </File> - <File - RelativePath="..\..\MEM_RefCounted.h"> - </File> - <File - RelativePath="..\..\MEM_RefCountedC-Api.h"> - </File> - <File - RelativePath="..\..\MEM_RefCountPtr.h"> - </File> - <File - RelativePath="..\..\MEM_SmartPtr.h"> - </File> - </Filter> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/memutil/make/msvc_9_0/memutil.vcproj b/intern/memutil/make/msvc_9_0/memutil.vcproj deleted file mode 100644 index 0b8251f0d7e..00000000000 --- a/intern/memutil/make/msvc_9_0/memutil.vcproj +++ /dev/null @@ -1,386 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_memutil"
- ProjectGUID="{E86B7BDE-C33C-4E55-9433-E74C141D7538}"
- RootNamespace="memutil"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\memutil\debug\memutil.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\memutil\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\memutil\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\memutil\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\memutil.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_9\intern\memutil\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\memutil\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\memutil"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\memutil"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\memutil\memutil.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\memutil\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\memutil\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\memutil\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\memutil.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_9\intern\memutil\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\memutil\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\memutil.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\memutil.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_9\intern\memutil\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\memutil\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\intern;..\..\..\memutil"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug\memutil.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\memutil\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\memutil.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MEM files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\memutil\include MKDIR ..\..\..\..\..\build\msvc_9\intern\memutil\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\memutil\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\intern\MEM_CacheLimiterC-Api.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\MEM_RefCountedC-Api.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\MEM_Allocator.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_CacheLimiter.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_CacheLimiterC-Api.h"
- >
- </File>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\MEM_NonCopyable.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_RefCounted.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_RefCountedC-Api.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_RefCountPtr.h"
- >
- </File>
- <File
- RelativePath="..\..\MEM_SmartPtr.h"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index 91c523eced9..b9fd8986268 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -24,8 +24,47 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC include) +set(INC + include +) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/MT_Assert.cpp + intern/MT_CmMatrix4x4.cpp + intern/MT_Matrix3x3.cpp + intern/MT_Matrix4x4.cpp + intern/MT_Plane3.cpp + intern/MT_Point3.cpp + intern/MT_Quaternion.cpp + intern/MT_Transform.cpp + intern/MT_Vector2.cpp + intern/MT_Vector3.cpp + intern/MT_Vector4.cpp + intern/MT_random.cpp -BLENDERLIB(bf_intern_moto "${SRC}" "${INC}") + include/GEN_List.h + include/GEN_Map.h + include/MT_CmMatrix4x4.h + include/MT_Matrix3x3.h + include/MT_Matrix4x4.h + include/MT_MinMax.h + include/MT_Optimize.h + include/MT_Plane3.h + include/MT_Point2.h + include/MT_Point3.h + include/MT_Quaternion.h + include/MT_Scalar.h + include/MT_Stream.h + include/MT_Transform.h + include/MT_Tuple2.h + include/MT_Tuple3.h + include/MT_Tuple4.h + include/MT_Vector2.h + include/MT_Vector3.h + include/MT_Vector4.h + include/MT_assert.h + include/MT_random.h + include/NM_Scalar.h +) + +blender_add_lib(bf_intern_moto "${SRC}" "${INC}") diff --git a/intern/moto/Makefile b/intern/moto/Makefile deleted file mode 100644 index 3ad4fde9c4e..00000000000 --- a/intern/moto/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# moto main makefile. -# - -include nan_definitions.mk - -LIBNAME = moto -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not ready yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_MOTO) ] || mkdir $(NAN_MOTO) - @[ -d $(NAN_MOTO)/include ] || mkdir $(NAN_MOTO)/include - @[ -d $(NAN_MOTO)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_MOTO)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libmoto.a $(NAN_MOTO)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a -endif - @../tools/cpifdiff.sh include/*.h $(NAN_MOTO)/include/ - diff --git a/intern/moto/include/MT_assert.h b/intern/moto/include/MT_assert.h index cc6f980efb4..a0e97e6ad34 100644 --- a/intern/moto/include/MT_assert.h +++ b/intern/moto/include/MT_assert.h @@ -48,7 +48,7 @@ MT_CDECL int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert); -#ifdef NDEBUG +#if !defined(DEBUG) #define MT_assert(predicate) ((void)0) #define BREAKPOINT() ((void)0) #else @@ -93,7 +93,7 @@ abort(); } #endif /* windows */ -#endif /* NDEBUG */ +#endif /* !defined(DEBUG) */ #endif diff --git a/intern/moto/intern/Makefile b/intern/moto/intern/Makefile deleted file mode 100644 index a867fcadf96..00000000000 --- a/intern/moto/intern/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# moto intern Makefile -# - -LIBNAME = moto -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I../include - diff --git a/intern/moto/make/msvc_6_0/MoTo.dsp b/intern/moto/make/msvc_6_0/MoTo.dsp deleted file mode 100644 index 541c4aa4774..00000000000 --- a/intern/moto/make/msvc_6_0/MoTo.dsp +++ /dev/null @@ -1,379 +0,0 @@ -# Microsoft Developer Studio Project File - Name="MoTo" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=MoTo - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "MoTo.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "MoTo.mak" CFG="MoTo - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "MoTo - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "MoTo - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /Ob2 /I "..\..\include\\" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\libmoto.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\moto\*.lib ..\..\..\..\..\lib\windows\moto\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\moto\debug"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\moto\debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\moto\debug\libmoto.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\include\*.h ..\..\..\..\..\lib\windows\moto\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\*.lib ..\..\..\..\..\lib\windows\moto\lib\debug\*.a ECHO Copying Debug info. XCOPY /Y ..\..\..\..\obj\windows\intern\moto\debug\vc60.* ..\..\..\..\..\lib\windows\moto\lib\debug\ ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "MoTo - Win32 Release"
-# Name "MoTo - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\MT_CmMatrix4x4.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Matrix3x3.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Matrix4x4.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Plane3.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Point3.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Quaternion.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_random.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Transform.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector2.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector3.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\MT_Vector4.cpp
-
-!IF "$(CFG)" == "MoTo - Win32 Release"
-
-# ADD CPP /W3 /I "../../include"
-
-!ELSEIF "$(CFG)" == "MoTo - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "inlines"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix3x3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix4x4.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Plane3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Quaternion.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector2.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector3.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector4.inl
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\include\GEN_List.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\GEN_Map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_assert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_CmMatrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix3x3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Matrix4x4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_MinMax.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Optimize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Plane3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Point3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Quaternion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_random.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Scalar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Transform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Tuple4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\MT_Vector4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\NM_Scalar.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/moto/make/msvc_6_0/MoTo.dsw b/intern/moto/make/msvc_6_0/MoTo.dsw deleted file mode 100644 index e45520d5c72..00000000000 --- a/intern/moto/make/msvc_6_0/MoTo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MoTo"=.\MoTo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/moto/make/msvc_7_0/moto.sln b/intern/moto/make/msvc_7_0/moto.sln deleted file mode 100644 index c1c34ff4af1..00000000000 --- a/intern/moto/make/msvc_7_0/moto.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoTo", "MoTo.vcproj", "{11ABF09B-4414-4188-8071-27CE3FE49256}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {11ABF09B-4414-4188-8071-27CE3FE49256}.Debug.ActiveCfg = Debug|Win32 - {11ABF09B-4414-4188-8071-27CE3FE49256}.Debug.Build.0 = Debug|Win32 - {11ABF09B-4414-4188-8071-27CE3FE49256}.Release.ActiveCfg = Release|Win32 - {11ABF09B-4414-4188-8071-27CE3FE49256}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/moto/make/msvc_7_0/moto.vcproj b/intern/moto/make/msvc_7_0/moto.vcproj deleted file mode 100644 index 6ecff4b78d0..00000000000 --- a/intern/moto/make/msvc_7_0/moto.vcproj +++ /dev/null @@ -1,543 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="MoTo" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\moto" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\moto" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\include\" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\moto\MoTo.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\moto\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\moto\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\moto\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libmoto.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MOTO files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_7\intern\moto\include -XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_7\intern\moto\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\moto\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\moto\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\moto\debug\MoTo.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\moto\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\moto\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\moto\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libmoto.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MOTO files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_7\intern\moto\include -XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_7\intern\moto\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\moto\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\moto\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..\include\" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\MoTo.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libmoto.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MOTO files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_7\intern\moto\include -XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_7\intern\moto\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include\" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug\MoTo.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\moto\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libmoto.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying MOTO files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_7\intern\moto\include -XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_7\intern\moto\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1043"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\..\intern\MT_CmMatrix4x4.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Matrix3x3.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Matrix4x4.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Plane3.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Point3.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Quaternion.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_random.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Transform.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Vector2.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Vector3.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\MT_Vector4.cpp"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)" - WarningLevel="3"/> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="..\..\include\GEN_List.h"> - </File> - <File - RelativePath="..\..\include\GEN_Map.h"> - </File> - <File - RelativePath="..\..\include\MT_assert.h"> - </File> - <File - RelativePath="..\..\include\MT_CmMatrix4x4.h"> - </File> - <File - RelativePath="..\..\include\MT_Matrix3x3.h"> - </File> - <File - RelativePath="..\..\include\MT_Matrix4x4.h"> - </File> - <File - RelativePath="..\..\include\MT_MinMax.h"> - </File> - <File - RelativePath="..\..\include\MT_Optimize.h"> - </File> - <File - RelativePath="..\..\include\MT_Plane3.h"> - </File> - <File - RelativePath="..\..\include\MT_Point2.h"> - </File> - <File - RelativePath="..\..\include\MT_Point3.h"> - </File> - <File - RelativePath="..\..\include\MT_Quaternion.h"> - </File> - <File - RelativePath="..\..\include\MT_random.h"> - </File> - <File - RelativePath="..\..\include\MT_Scalar.h"> - </File> - <File - RelativePath="..\..\include\MT_Stream.h"> - </File> - <File - RelativePath="..\..\include\MT_Transform.h"> - </File> - <File - RelativePath="..\..\include\MT_Tuple2.h"> - </File> - <File - RelativePath="..\..\include\MT_Tuple3.h"> - </File> - <File - RelativePath="..\..\include\MT_Tuple4.h"> - </File> - <File - RelativePath="..\..\include\MT_Vector2.h"> - </File> - <File - RelativePath="..\..\include\MT_Vector3.h"> - </File> - <File - RelativePath="..\..\include\MT_Vector4.h"> - </File> - <File - RelativePath="..\..\include\NM_Scalar.h"> - </File> - <Filter - Name="inlines" - Filter=""> - <File - RelativePath="..\..\include\MT_Matrix3x3.inl"> - </File> - <File - RelativePath="..\..\include\MT_Matrix4x4.inl"> - </File> - <File - RelativePath="..\..\include\MT_Plane3.inl"> - </File> - <File - RelativePath="..\..\include\MT_Point2.inl"> - </File> - <File - RelativePath="..\..\include\MT_Point3.inl"> - </File> - <File - RelativePath="..\..\include\MT_Quaternion.inl"> - </File> - <File - RelativePath="..\..\include\MT_Vector2.inl"> - </File> - <File - RelativePath="..\..\include\MT_Vector3.inl"> - </File> - <File - RelativePath="..\..\include\MT_Vector4.inl"> - </File> - </Filter> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/moto/make/msvc_9_0/moto.vcproj b/intern/moto/make/msvc_9_0/moto.vcproj deleted file mode 100644 index 34c5705e2f2..00000000000 --- a/intern/moto/make/msvc_9_0/moto.vcproj +++ /dev/null @@ -1,714 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_MoTo"
- ProjectGUID="{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}"
- RootNamespace="MoTo"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\moto"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\moto"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\include\"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\moto\MoTo.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\moto\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\moto\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\moto\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libmoto.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MOTO files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_9\intern\moto\include
XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_9\intern\moto\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\moto\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\moto\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include\"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\moto\debug\MoTo.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\moto\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\moto\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\moto\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libmoto.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MOTO files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_9\intern\moto\include
XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_9\intern\moto\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\moto\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\moto\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\include\"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\MoTo.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libmoto.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MOTO files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_9\intern\moto\include
XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_9\intern\moto\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include\"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug\MoTo.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\moto\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libmoto.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying MOTO files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\moto\include MKDIR ..\..\..\..\..\build\msvc_9\intern\moto\include
XCOPY /Y ..\..\include\*.h ..\..\..\..\..\build\msvc_9\intern\moto\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\intern\MT_CmMatrix4x4.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Matrix3x3.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Matrix4x4.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Plane3.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Point3.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Quaternion.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_random.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Transform.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Vector2.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Vector3.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\MT_Vector4.cpp"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\;../../include;$(NoInherit)"
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\include\GEN_List.h"
- >
- </File>
- <File
- RelativePath="..\..\include\GEN_Map.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_assert.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_CmMatrix4x4.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Matrix3x3.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Matrix4x4.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_MinMax.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Optimize.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Plane3.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Point2.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Point3.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Quaternion.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_random.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Scalar.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Stream.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Transform.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Tuple2.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Tuple3.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Tuple4.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector2.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector3.h"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector4.h"
- >
- </File>
- <File
- RelativePath="..\..\include\NM_Scalar.h"
- >
- </File>
- <Filter
- Name="inlines"
- >
- <File
- RelativePath="..\..\include\MT_Matrix3x3.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Matrix4x4.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Plane3.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Point2.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Point3.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Quaternion.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector2.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector3.inl"
- >
- </File>
- <File
- RelativePath="..\..\include\MT_Vector4.inl"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index b29eaa680b6..f200e24fff1 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -24,8 +24,55 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC extern superlu) +# External project, better not fix warnings. +remove_strict_flags() -FILE(GLOB SRC intern/*.c superlu/*.c) +set(INC + extern + superlu +) -BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}") +set(SRC + intern/opennl.c + superlu/colamd.c + superlu/get_perm_c.c + superlu/heap_relax_snode.c + superlu/lsame.c + superlu/memory.c + superlu/mmd.c + superlu/relax_snode.c + superlu/scolumn_bmod.c + superlu/scolumn_dfs.c + superlu/scopy_to_ucol.c + superlu/sgssv.c + superlu/sgstrf.c + superlu/sgstrs.c + superlu/smemory.c + superlu/smyblas2.c + superlu/sp_coletree.c + superlu/sp_ienv.c + superlu/sp_preorder.c + superlu/spanel_bmod.c + superlu/spanel_dfs.c + superlu/spivotL.c + superlu/spruneL.c + superlu/ssnode_bmod.c + superlu/ssnode_dfs.c + superlu/ssp_blas2.c + superlu/ssp_blas3.c + superlu/strsv.c + superlu/superlu_timer.c + superlu/sutil.c + superlu/util.c + superlu/xerbla.c + + extern/ONL_opennl.h + superlu/BLO_sys_types.h + superlu/Cnames.h + superlu/colamd.h + superlu/ssp_defs.h + superlu/supermatrix.h + superlu/util.h +) + +blender_add_lib(bf_intern_opennl "${SRC}" "${INC}") diff --git a/intern/opennl/Makefile b/intern/opennl/Makefile deleted file mode 100644 index 023491792db..00000000000 --- a/intern/opennl/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# opennl main makefile. -# - -include nan_definitions.mk - -LIBNAME = opennl -LIBNAME_SLU = superlu -SOURCEDIR = intern/$(LIBNAME) -SOURCEDIR_SLU = intern/$(LIBNAME_SLU) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIR_SLU = $(OCGDIR)/$(SOURCEDIR_SLU) -DIRS = intern superlu - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_OPENNL) ] || mkdir $(NAN_OPENNL) - @[ -d $(NAN_OPENNL)/include ] || mkdir $(NAN_OPENNL)/include - @[ -d $(NAN_OPENNL)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_OPENNL)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libopennl.a $(NAN_OPENNL)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_OPENNL)/include/ - @[ -d $(NAN_SUPERLU) ] || mkdir $(NAN_SUPERLU) - @[ -d $(NAN_SUPERLU)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SUPERLU)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR_SLU)/$(DEBUG_DIR)libsuperlu.a $(NAN_SUPERLU)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a -endif - diff --git a/intern/opennl/extern/ONL_opennl.h b/intern/opennl/extern/ONL_opennl.h index be76aa95eac..c87cb7ef146 100644 --- a/intern/opennl/extern/ONL_opennl.h +++ b/intern/opennl/extern/ONL_opennl.h @@ -136,7 +136,7 @@ void nlMatrixMultiply(NLfloat *x, NLfloat *y); /* Solve */ void nlPrintMatrix(void); -NLboolean nlSolve(); +NLboolean nlSolve(void); NLboolean nlSolveAdvanced(NLint *permutation, NLboolean solveAgain); #ifdef __cplusplus diff --git a/intern/opennl/intern/Makefile b/intern/opennl/intern/Makefile deleted file mode 100644 index 04b158aaec0..00000000000 --- a/intern/opennl/intern/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# opennl intern Makefile -# - -LIBNAME = opennl -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(NAN_LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I../superlu -I../extern - - diff --git a/intern/opennl/make/msvc_6_0/OpenNL.dsp b/intern/opennl/make/msvc_6_0/OpenNL.dsp deleted file mode 100644 index aaf8f0298c1..00000000000 --- a/intern/opennl/make/msvc_6_0/OpenNL.dsp +++ /dev/null @@ -1,252 +0,0 @@ -# Microsoft Developer Studio Project File - Name="OpenNL" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=OpenNL - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "OpenNL.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "OpenNL.mak" CFG="OpenNL - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "OpenNL - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "OpenNL - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "OpenNL - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../obj/windows/intern/opennl"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../extern" /I "../../superlu" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl\blender_ONL.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h ECHO copy library XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\*.lib ..\..\..\..\..\lib\windows\openNL\*.lib
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "OpenNL - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../obj/windows/intern/opennl/Debug/"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/opennl/imf/Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../extern" /I "../../superlu" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/opennl/Debug/blender_ONL.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO copy header files XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\lib\windows\opennl\include\*.h ECHO copy library XCOPY /Y ..\..\..\..\obj\windows\intern\openNL\debug\*.lib ..\..\..\..\..\lib\windows\openNL\debug\*.lib
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "OpenNL - Win32 Release"
-# Name "OpenNL - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\superlu\colamd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\get_perm_c.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\heap_relax_snode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\lsame.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\memory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\mmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\intern\opennl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\relax_snode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scolumn_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scolumn_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\scopy_to_ucol.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgssv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgstrf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sgstrs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\smemory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\smyblas2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_coletree.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_ienv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sp_preorder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spanel_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spanel_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spivotL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\spruneL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssnode_bmod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssnode_dfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_blas2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_blas3.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\strsv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\superlu_timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\sutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\xerbla.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\superlu\Cnames.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\colamd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\extern\ONL_opennl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\ssp_defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\supermatrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\superlu\util.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/intern/opennl/make/msvc_6_0/OpenNL.dsw b/intern/opennl/make/msvc_6_0/OpenNL.dsw deleted file mode 100644 index 5b7c9138c97..00000000000 --- a/intern/opennl/make/msvc_6_0/OpenNL.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "OpenNL"=.\OpenNL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/opennl/make/msvc_7_0/opennl.vcproj b/intern/opennl/make/msvc_7_0/opennl.vcproj deleted file mode 100644 index d302a2508ab..00000000000 --- a/intern/opennl/make/msvc_7_0/opennl.vcproj +++ /dev/null @@ -1,745 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="opennl" - ProjectGUID="{8B8D4FC3-3234-4E54-8376-5AB83D00D164}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu" - PreprocessorDefinitions="_DEBUG,WIN32,_LIB" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\opennl\debug\OpenNL.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\opennl\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\opennl\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\opennl\debug\" - WarningLevel="2" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libopennl.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying OpenNL files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_7\intern\opennl\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\opennl\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\opennl" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\opennl" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" - AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu" - PreprocessorDefinitions="NDEBUG,WIN32,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\opennl\OpenNL.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\opennl\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\opennl\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\opennl\" - WarningLevel="2" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="1"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libopennl.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying OpenNL files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_7\intern\opennl\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\opennl\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" - AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu" - PreprocessorDefinitions="NDEBUG,WIN32,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\OpenNL.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\" - WarningLevel="2" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="1"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libopennl.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying OpenNL files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_7\intern\opennl\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\opennl\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu" - PreprocessorDefinitions="_DEBUG,WIN32,_LIB" - MinimalRebuild="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug\OpenNL.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\opennl\mtdll\debug\" - WarningLevel="2" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libopennl.lib"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying OpenNL files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_7\intern\opennl\include -XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_7\intern\opennl\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> - <File - RelativePath="..\..\superlu\colamd.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\get_perm_c.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\heap_relax_snode.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\lsame.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\memory.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\mmd.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\intern\opennl.c"> - </File> - <File - RelativePath="..\..\superlu\relax_snode.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\scolumn_bmod.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\scolumn_dfs.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\scopy_to_ucol.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sgssv.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sgstrf.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sgstrs.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\smemory.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\smyblas2.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sp_coletree.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sp_ienv.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sp_preorder.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\spanel_bmod.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\spanel_dfs.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\spivotL.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\spruneL.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\ssnode_bmod.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\ssnode_dfs.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\ssp_blas2.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\ssp_blas3.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\strsv.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\superlu_timer.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\sutil.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\util.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\superlu\xerbla.c"> - <FileConfiguration - Name="Blender Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - <FileConfiguration - Name="3DPlugin Release|Win32"> - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc"> - <File - RelativePath="..\..\extern\ONL_opennl.h"> - </File> - <Filter - Name="superlu" - Filter=""> - <File - RelativePath="..\..\superlu\BLO_sys_types.h"> - </File> - <File - RelativePath="..\..\superlu\Cnames.h"> - </File> - <File - RelativePath="..\..\superlu\colamd.h"> - </File> - <File - RelativePath="..\..\superlu\ssp_defs.h"> - </File> - <File - RelativePath="..\..\superlu\supermatrix.h"> - </File> - <File - RelativePath="..\..\superlu\util.h"> - </File> - </Filter> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/opennl/make/msvc_9_0/opennl.vcproj b/intern/opennl/make/msvc_9_0/opennl.vcproj deleted file mode 100644 index 28051a491d2..00000000000 --- a/intern/opennl/make/msvc_9_0/opennl.vcproj +++ /dev/null @@ -1,993 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_opennl"
- ProjectGUID="{8B8D4FC3-3234-4E54-8376-5AB83D00D164}"
- RootNamespace="opennl"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\opennl\debug\OpenNL.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\opennl\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\opennl\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\opennl\debug\"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libopennl.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying OpenNL files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_9\intern\opennl\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\opennl\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\opennl"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\opennl"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\opennl\OpenNL.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\opennl\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\opennl\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\opennl\"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libopennl.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying OpenNL files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_9\intern\opennl\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\opennl\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- DefaultCharIsUnsigned="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\OpenNL.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libopennl.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying OpenNL files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_9\intern\opennl\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\opennl\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\opennl\extern;..\..\..\opennl\superlu"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug\OpenNL.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\opennl\mtdll\debug\"
- WarningLevel="2"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libopennl.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying OpenNL files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\opennl\include MKDIR ..\..\..\..\..\build\msvc_9\intern\opennl\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\opennl\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
- >
- <File
- RelativePath="..\..\superlu\colamd.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\get_perm_c.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\heap_relax_snode.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\lsame.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\memory.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\mmd.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\intern\opennl.c"
- >
- </File>
- <File
- RelativePath="..\..\superlu\relax_snode.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\scolumn_bmod.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\scolumn_dfs.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\scopy_to_ucol.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sgssv.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sgstrf.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sgstrs.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\smemory.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\smyblas2.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sp_coletree.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sp_ienv.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sp_preorder.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\spanel_bmod.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\spanel_dfs.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\spivotL.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\spruneL.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\ssnode_bmod.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\ssnode_dfs.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\ssp_blas2.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\ssp_blas3.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\strsv.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\superlu_timer.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\sutil.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\util.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\superlu\xerbla.c"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3DPlugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc"
- >
- <File
- RelativePath="..\..\extern\ONL_opennl.h"
- >
- </File>
- <Filter
- Name="superlu"
- >
- <File
- RelativePath="..\..\superlu\BLO_sys_types.h"
- >
- </File>
- <File
- RelativePath="..\..\superlu\Cnames.h"
- >
- </File>
- <File
- RelativePath="..\..\superlu\colamd.h"
- >
- </File>
- <File
- RelativePath="..\..\superlu\ssp_defs.h"
- >
- </File>
- <File
- RelativePath="..\..\superlu\supermatrix.h"
- >
- </File>
- <File
- RelativePath="..\..\superlu\util.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/opennl/superlu/Makefile b/intern/opennl/superlu/Makefile deleted file mode 100644 index 46b1066a676..00000000000 --- a/intern/opennl/superlu/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# opennl intern Makefile -# - -LIBNAME = superlu -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(NAN_LEVEL_2_CPP_WARNINGS) - diff --git a/intern/opennl/superlu/smemory.c b/intern/opennl/superlu/smemory.c index 7eefb900673..d256d473f1c 100644 --- a/intern/opennl/superlu/smemory.c +++ b/intern/opennl/superlu/smemory.c @@ -621,7 +621,7 @@ sStackCompress(GlobalLU_t *Glu) Glu->usub = usub; #ifdef DEBUG - printf("sStackCompress: fragment %d\n", fragment); + printf("sStackCompress: fragment %d\n", (int)*fragment); /* for (last = 0; last < ndim; ++last) print_lu_col("After compress:", last, 0);*/ #endif diff --git a/intern/opennl/superlu/ssp_defs.h b/intern/opennl/superlu/ssp_defs.h index 61b324e74d8..7828a47d260 100644 --- a/intern/opennl/superlu/ssp_defs.h +++ b/intern/opennl/superlu/ssp_defs.h @@ -228,7 +228,7 @@ extern void check_tempv(int, float *); extern int print_int_vec(char *what, int n, int *vec); extern int sp_symetree(int *acolst, int *acolend, int *arow, int n, int *parent); - +extern void sprint_lu_col(char *msg, int jcol, int pivrow, int *xprune, GlobalLU_t *Glu); // added to build with debug for blender - campbell #ifdef __cplusplus } #endif diff --git a/intern/opennl/superlu/util.h b/intern/opennl/superlu/util.h index 1a3526d4e7e..953242d606d 100644 --- a/intern/opennl/superlu/util.h +++ b/intern/opennl/superlu/util.h @@ -246,7 +246,7 @@ extern void heap_relax_snode (const int, int *, const int, int *, int *); extern void resetrep_col (const int, const int *, int *); extern int spcoletree (int *, int *, int *, int, int, int *); extern int *TreePostorder (int, int *); -extern double SuperLU_timer_ (); +extern double SuperLU_timer_ (void); extern int sp_ienv (int); extern int lsame_ (char *, char *); extern int xerbla_ (char *, int *); diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 6c844cbd232..486ef92f638 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -24,25 +24,70 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC intern ../memutil - ../guardealloc ../../extern/bullet2/src - ${PNG_INC} - ${ZLIB_INC} + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) -FILE(GLOB SRC intern/*.cpp) +set(SRC + intern/EIGENVALUE_HELPER.cpp + intern/FLUID_3D.cpp + intern/FLUID_3D_SOLVERS.cpp + intern/FLUID_3D_STATIC.cpp + intern/LU_HELPER.cpp + intern/SPHERE.cpp + intern/WTURBULENCE.cpp + intern/smoke_API.cpp -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) + extern/smoke_API.h + intern/EIGENVALUE_HELPER.h + intern/FFT_NOISE.h + intern/FLUID_3D.h + intern/IMAGE.h + intern/INTERPOLATE.h + intern/LU_HELPER.h + intern/MERSENNETWISTER.h + intern/OBSTACLE.h + intern/SPHERE.h + intern/VEC3.h + intern/WAVELET_NOISE.h + intern/WTURBULENCE.h + intern/tnt/jama_eig.h + intern/tnt/jama_lu.h + intern/tnt/tnt.h + intern/tnt/tnt_array1d.h + intern/tnt/tnt_array1d_utils.h + intern/tnt/tnt_array2d.h + intern/tnt/tnt_array2d_utils.h + intern/tnt/tnt_array3d.h + intern/tnt/tnt_array3d_utils.h + intern/tnt/tnt_cmat.h + intern/tnt/tnt_fortran_array1d.h + intern/tnt/tnt_fortran_array1d_utils.h + intern/tnt/tnt_fortran_array2d.h + intern/tnt/tnt_fortran_array2d_utils.h + intern/tnt/tnt_fortran_array3d.h + intern/tnt/tnt_fortran_array3d_utils.h + intern/tnt/tnt_i_refvec.h + intern/tnt/tnt_math_utils.h + intern/tnt/tnt_sparse_matrix_csr.h + intern/tnt/tnt_stopwatch.h + intern/tnt/tnt_subscript.h + intern/tnt/tnt_vec.h + intern/tnt/tnt_version.h +) + +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -IF(WITH_FFTW3) - ADD_DEFINITIONS(-DFFTW3=1) - LIST(APPEND INC ${FFTW3_INC}) -ENDIF(WITH_FFTW3) +if(WITH_FFTW3) + add_definitions(-DFFTW3=1) + list(APPEND INC ${FFTW3_INC}) +endif() -BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}") +blender_add_lib(bf_intern_smoke "${SRC}" "${INC}") diff --git a/intern/smoke/Makefile b/intern/smoke/Makefile deleted file mode 100644 index e5144a9c3f8..00000000000 --- a/intern/smoke/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# smoke main makefile. -# - -include nan_definitions.mk - -unexport NAN_QUIET - -LIBNAME = smoke -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -#not ready yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_SMOKE) ] || mkdir $(NAN_SMOKE) - @[ -d $(NAN_SMOKE)/include ] || mkdir $(NAN_SMOKE)/include - @[ -d $(NAN_SMOKE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_SMOKE)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_SMOKE)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_SMOKE)/lib/$(DEBUG_DIR)lib$(LIBNAME).a -endif - @../tools/cpifdiff.sh extern/*.h $(NAN_SMOKE)/include/ - diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp index 05fbb918d24..27218d2682c 100644 --- a/intern/smoke/intern/FLUID_3D.cpp +++ b/intern/smoke/intern/FLUID_3D.cpp @@ -605,7 +605,7 @@ void FLUID_3D::copyBorderAll(float* field, int zBegin, int zEnd) int zSize = zEnd-zBegin; int _blockTotalCells=_slabSize * zSize; - if ((zBegin==0)) + if (zBegin==0) for (int y = 0; y < _yRes; y++) for (int x = 0; x < _xRes; x++) { @@ -723,7 +723,7 @@ void FLUID_3D::wipeBoundariesSL(int zBegin, int zEnd) const int totalCells = _xRes * _yRes * _zRes; index = 0; - if ((zBegin == 0)) + if (zBegin == 0) for (y = 0; y < _yRes; y++) for (x = 0; x < _xRes; x++, index++) { diff --git a/intern/smoke/intern/Makefile b/intern/smoke/intern/Makefile deleted file mode 100644 index 760b1627a91..00000000000 --- a/intern/smoke/intern/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# smoke intern Makefile -# - -LIBNAME = smoke -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -unexport NAN_QUIET - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -ifeq ($(WITH_BF_OPENMP),true) - CPPFLAGS += -DPARALLEL -endif - -ifeq ($(WITH_FFTW3),true) - CPPFLAGS += -DFFTW3=1 - CPPFLAGS += $(BF_FFTW3_INC) -endif - -CPPFLAGS += -I. -CPPFLAGS += -I../extern -CPPFLAGS += -I$(NAN_PNG)/include -CPPFLAGS += -I$(NAN_PNG)/include/libpng - -# zlib -ifeq ($(OS),$(findstring $(OS), "solaris windows")) - CPPFLAGS += -I$(NAN_ZLIB)/include -endif diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h index 7056b1db5be..1c55acfb1ca 100644 --- a/intern/smoke/intern/WAVELET_NOISE.h +++ b/intern/smoke/intern/WAVELET_NOISE.h @@ -243,6 +243,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) || (headerbuffer[headerlen-1] != (char)((char)sizeof(long)+'0'))) { printf("loadTile : Noise tile '%s' was generated on an incompatible platform.\n",filename.c_str()); + fclose(file); return false; } diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp index 917c510348a..1248b6957a2 100644 --- a/intern/smoke/intern/WTURBULENCE.cpp +++ b/intern/smoke/intern/WTURBULENCE.cpp @@ -958,8 +958,8 @@ void WTURBULENCE::stepTurbulenceFull(float dtOrg, float* xvel, float* yvel, floa for (int i = 1; i < threadval; i++) if (maxVelMag < maxVelMagThreads[i]) maxVelMag = maxVelMagThreads[i]; - delete [] maxVelMagThreads; #endif + delete [] maxVelMagThreads; // prepare density for an advection diff --git a/intern/smoke/make/msvc_9_0/smoke.vcproj b/intern/smoke/make/msvc_9_0/smoke.vcproj deleted file mode 100644 index eb412ac10f2..00000000000 --- a/intern/smoke/make/msvc_9_0/smoke.vcproj +++ /dev/null @@ -1,520 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_smoke"
- ProjectGUID="{E8904FB3-F8F7-BC21-87A6-029A57B901F4}"
- RootNamespace="smoke"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\smoke.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libsmoke.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\debug\smoke.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libsmoke.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\smoke.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libsmoke.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\build\msvc_9\extern\bullet\include;..\..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\..\build\msvc_9\intern\guardedalloc\include"
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\smoke.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\smoke\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libsmoke.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying IK files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\smoke\include MKDIR ..\..\..\..\..\build\msvc_9\intern\smoke\include
XCOPY /Y ..\..\extern\*.h ..\..\..\..\..\build\msvc_9\intern\smoke\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="intern"
- >
- <File
- RelativePath="..\..\intern\EIGENVALUE_HELPER.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\EIGENVALUE_HELPER.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\FFT_NOISE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\FLUID_3D.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\FLUID_3D.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\FLUID_3D_SOLVERS.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\FLUID_3D_STATIC.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\IMAGE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\INTERPOLATE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\LU_HELPER.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\LU_HELPER.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\MERSENNETWISTER.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\OBSTACLE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\smoke_API.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\SPHERE.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\SPHERE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\VEC3.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\WAVELET_NOISE.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\WTURBULENCE.cpp"
- >
- </File>
- <File
- RelativePath="..\..\intern\WTURBULENCE.h"
- >
- </File>
- <Filter
- Name="TNT"
- >
- <File
- RelativePath="..\..\intern\tnt\jama_eig.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\jama_lu.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array1d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array1d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array2d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array2d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array3d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_array3d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_cmat.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array1d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array1d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array2d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array2d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array3d.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_fortran_array3d_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_i_refvec.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_math_utils.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_sparse_matrix_csr.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_stopwatch.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_subscript.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_vec.h"
- >
- </File>
- <File
- RelativePath="..\..\intern\tnt\tnt_version.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\extern\smoke_API.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index a1b130d93be..60796185e70 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -24,7 +24,15 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) -SET(SRC ./intern/STR_String.cpp) +set(INC + . +) -BLENDERLIB(bf_intern_string "${SRC}" "${INC}") +set(SRC + intern/STR_String.cpp + + STR_HashedString.h + STR_String.h +) + +blender_add_lib(bf_intern_string "${SRC}" "${INC}") diff --git a/intern/string/Makefile b/intern/string/Makefile deleted file mode 100644 index 7972defd406..00000000000 --- a/intern/string/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Hans Lambermont, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# string main makefile. -# - -include nan_definitions.mk - -LIBNAME = string -SOURCEDIR = intern/$(LIBNAME) -DIR = $(OCGDIR)/$(SOURCEDIR) -DIRS = intern -# not yet TESTDIRS = test - -include nan_subdirs.mk - -install: $(ALL_OR_DEBUG) - @[ -d $(NAN_STRING) ] || mkdir $(NAN_STRING) - @[ -d $(NAN_STRING)/include ] || mkdir $(NAN_STRING)/include - @[ -d $(NAN_STRING)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_STRING)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libstring.a $(NAN_STRING)/lib/$(DEBUG_DIR) -ifeq ($(OS),darwin) - ranlib $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -endif - @../tools/cpifdiff.sh *.h $(NAN_STRING)/include/ - diff --git a/intern/string/SConscript b/intern/string/SConscript index f8342bf12c2..dac0ead8e61 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,10 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] ) +defs = [] + +if env['WITH_BF_CXX_GUARDEDALLOC']: + defs.append('WITH_CXX_GUARDEDALLOC') + incs += ' #intern/guardedalloc' + +env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] ) diff --git a/intern/string/intern/Makefile b/intern/string/intern/Makefile deleted file mode 100644 index 4a461fb03b3..00000000000 --- a/intern/string/intern/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# string intern Makefile -# - -LIBNAME = string -DIR = $(OCGDIR)/intern/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_2_CPP_WARNINGS) - -CPPFLAGS += -I.. - diff --git a/intern/string/make/msvc_6_0/string.dsp b/intern/string/make/msvc_6_0/string.dsp deleted file mode 100644 index 38250e44170..00000000000 --- a/intern/string/make/msvc_6_0/string.dsp +++ /dev/null @@ -1,122 +0,0 @@ -# Microsoft Developer Studio Project File - Name="string" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=string - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "string.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "string.mak" CFG="string - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "string - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "string - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "string - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\obj\windows\intern\string"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\string"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\string\libstring.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\string\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\..\lib\windows\string\lib\*.a ECHO Done
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "string - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../obj/windows/intern/string/debug"
-# PROP Intermediate_Dir "../../../../obj/windows/intern/string/debug"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/string/debug\libstring.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying header files XCOPY /Y ..\..\*.h ..\..\..\..\..\lib\windows\string\include\ ECHO Copying lib XCOPY /Y ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\..\lib\windows\string\lib\debug\*.a ECHO Done
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "string - Win32 Release"
-# Name "string - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\intern\STR_String.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "intern"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "extern"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\STR_HashedString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\STR_String.h
-# End Source File
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/intern/string/make/msvc_6_0/string.dsw b/intern/string/make/msvc_6_0/string.dsw deleted file mode 100644 index 23886681438..00000000000 --- a/intern/string/make/msvc_6_0/string.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "string"=".\string.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/intern/string/make/msvc_7_0/string.sln b/intern/string/make/msvc_7_0/string.sln deleted file mode 100644 index 53981b212ea..00000000000 --- a/intern/string/make/msvc_7_0/string.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "string.vcproj", "{0607A77B-49DD-42D8-A767-D0D60769DC90}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {0607A77B-49DD-42D8-A767-D0D60769DC90}.Debug.ActiveCfg = Debug|Win32 - {0607A77B-49DD-42D8-A767-D0D60769DC90}.Debug.Build.0 = Debug|Win32 - {0607A77B-49DD-42D8-A767-D0D60769DC90}.Release.ActiveCfg = Release|Win32 - {0607A77B-49DD-42D8-A767-D0D60769DC90}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/intern/string/make/msvc_7_0/string.vcproj b/intern/string/make/msvc_7_0/string.vcproj deleted file mode 100644 index deb342c26e8..00000000000 --- a/intern/string/make/msvc_7_0/string.vcproj +++ /dev/null @@ -1,269 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="string" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Blender Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\string\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\string\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\string\debug\string.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7/intern\string\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\string\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\string\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\debug\libstring.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying STRING files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\string\include MKDIR ..\..\..\..\..\build\msvc_7\intern\string\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\string\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Blender Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\string" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\string" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\string\string.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7/intern\string\" - ObjectFile="..\..\..\..\..\build\msvc_7/intern\string\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7/intern\string\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\libstring.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying STRING files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\string\include MKDIR ..\..\..\..\..\build\msvc_7\intern\string\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\string\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Release|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\string\mtdll" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\string\mtdll" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\string\mtdll\string.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7/intern\string\mtdll\" - ObjectFile="..\..\..\..\..\build\msvc_7/intern\string\mtdll\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7/intern\string\mtdll\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\libstring.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying STRING files library to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\string\include MKDIR ..\..\..\..\..\build\msvc_7\intern\string\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\string\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="3DPlugin Debug|Win32" - OutputDirectory="..\..\..\..\..\build\msvc_7\intern\string\mtdll\debug" - IntermediateDirectory="..\..\..\..\..\build\msvc_7\intern\string\mtdll\debug" - ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\.." - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="2" - PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\intern\string\mtdll\debug\string.pch" - AssemblerListingLocation="..\..\..\..\..\build\msvc_7/intern\string\mtdll\debug\" - ObjectFile="..\..\..\..\..\build\msvc_7\intern\string\mtdll\debug\" - ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\intern\string\mtdll\debug\" - WarningLevel="2" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="..\..\..\..\..\build\msvc_7\libs\intern\mtdll\debug\libstring.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - Description="Copying STRING files library (debug target) to lib tree." - CommandLine="ECHO Copying header files -IF NOT EXIST ..\..\..\..\..\build\msvc_7\intern\string\include MKDIR ..\..\..\..\..\build\msvc_7\intern\string\include -XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_7\intern\string\include -ECHO Done -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\..\intern\STR_String.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <Filter - Name="extern" - Filter=""> - <File - RelativePath="..\..\STR_HashedString.h"> - </File> - <File - RelativePath="..\..\STR_String.h"> - </File> - </Filter> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/intern/string/make/msvc_9_0/string.vcproj b/intern/string/make/msvc_9_0/string.vcproj deleted file mode 100644 index 512d67623b6..00000000000 --- a/intern/string/make/msvc_9_0/string.vcproj +++ /dev/null @@ -1,356 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="INT_string"
- ProjectGUID="{B789C2F3-279E-4A85-8F0A-7F7AC068E598}"
- RootNamespace="string"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Blender Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\string\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\string\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\string\debug\string.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9/intern\string\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\string\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\string\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\debug\libstring.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying STRING files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\string\include MKDIR ..\..\..\..\..\build\msvc_9\intern\string\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\string\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="Blender Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\string"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\string"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\string\string.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9/intern\string\"
- ObjectFile="..\..\..\..\..\build\msvc_9/intern\string\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9/intern\string\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\libstring.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying STRING files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\string\include MKDIR ..\..\..\..\..\build\msvc_9\intern\string\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\string\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Release|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\string\mtdll"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\string\mtdll"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\string\mtdll\string.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9/intern\string\mtdll\"
- ObjectFile="..\..\..\..\..\build\msvc_9/intern\string\mtdll\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9/intern\string\mtdll\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\libstring.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying STRING files library to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\string\include MKDIR ..\..\..\..\..\build\msvc_9\intern\string\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\string\include
ECHO Done
"
- />
- </Configuration>
- <Configuration
- Name="3DPlugin Debug|Win32"
- OutputDirectory="..\..\..\..\..\build\msvc_9\intern\string\mtdll\debug"
- IntermediateDirectory="..\..\..\..\..\build\msvc_9\intern\string\mtdll\debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="..\..\..\..\..\build\msvc_9\intern\string\mtdll\debug\string.pch"
- AssemblerListingLocation="..\..\..\..\..\build\msvc_9/intern\string\mtdll\debug\"
- ObjectFile="..\..\..\..\..\build\msvc_9\intern\string\mtdll\debug\"
- ProgramDataBaseFileName="..\..\..\..\..\build\msvc_9\intern\string\mtdll\debug\"
- WarningLevel="2"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\..\..\..\build\msvc_9\libs\intern\mtdll\debug\libstring.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Copying STRING files library (debug target) to lib tree."
- CommandLine="ECHO Copying header files
IF NOT EXIST ..\..\..\..\..\build\msvc_9\intern\string\include MKDIR ..\..\..\..\..\build\msvc_9\intern\string\include
XCOPY /Y ..\..\*.h ..\..\..\..\..\build\msvc_9\intern\string\include
ECHO Done
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\intern\STR_String.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <Filter
- Name="extern"
- >
- <File
- RelativePath="..\..\STR_HashedString.h"
- >
- </File>
- <File
- RelativePath="..\..\STR_String.h"
- >
- </File>
- </Filter>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index bbd1caa68ad..00000000000 --- a/po/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- -# vim: tabstop=8 -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2002 by Stichting Blender Foundation, -# Amsterdam, the Netherlands. -# All rights reserved. -# -# The Original Code is: revision 1.3 -# -# Contributor(s): Wouter van Heyst, GSR -# -# ***** END GPL LICENSE BLOCK ***** -# -# po Makefile for blender. Compiles the translations in the place -# where release can pick them up. - -PO_FILES = $(wildcard *.po) - -LINGUAS = $(basename $(PO_FILES)) - -SOURCEDIR = blender/po - -include nan_definitions.mk - -ifeq ($(OS), darwin) - DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/ -else - DIR = $(OCGDIR)/bin/.blender/locale/ -endif - -LINGUAS_DEST= $(foreach LINGUA, $(LINGUAS),$(DIR)$(LINGUA)/LC_MESSAGES/blender.mo) - -$(DIR)%/LC_MESSAGES/blender.mo: %.po - mkdir -p $(@D) - msgfmt -o $@ $< -ifeq ($(BF_VERIFY_MO_FILES), true) - @cmp $@ $(NANBLENDERHOME)/release/bin/.blender/locale/$(basename $<)/LC_MESSAGES/blender.mo \ - || ( echo Mismatch between generated and commited $(basename $<).mo catalog && \ - rm -f $@ && false ) -endif - -all debug:: $(LINGUAS_DEST) -# Just trigger the deps - -clean:: - rm -rf $(DIR) |