From 320ac3f0e289b2c4d8add38926913eb2d4809f55 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 18 Jan 2008 21:39:47 +0000 Subject: Fixing makefiles for binreloc I made it use flags like other things default on for linux. ideasman helped me get scons working. Cmake still needs some love... Kent --- extern/CMakeLists.txt | 3 +++ extern/Makefile | 4 ++++ extern/binreloc/CMakeLists.txt | 26 ++++++++++++++++++++++++++ extern/binreloc/Makefile | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 extern/binreloc/CMakeLists.txt create mode 100644 extern/binreloc/Makefile (limited to 'extern') diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 0f07bde72d5..1842aa05246 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -43,3 +43,6 @@ IF(WITH_VERSE) SUBDIRS(verse) ENDIF(WITH_VERSE) +if(WITH_BINRELOC) + SUBDIRS(binreloc) +ENDIF(WITH_BINRELOC) diff --git a/extern/Makefile b/extern/Makefile index 04b282a8926..4ca63b6e7f9 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -56,6 +56,10 @@ ifneq ($(NAN_NO_KETSJI), true) DIRS += bullet2 endif +ifeq ($(WITH_BINRELOC), true) + DIRS += binreloc +endif + TARGET = ifneq ($(OS),irix) TARGET=solid diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt new file mode 100644 index 00000000000..ee4dccf4cda --- /dev/null +++ b/extern/binreloc/CMakeLists.txt @@ -0,0 +1,26 @@ +# ***** 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) 2008 by The Blender Foundation +# All rights reserved. +# + +SET(INC ./include ${WINTAB_INC}) +ADD_DEFINITIONS(-DWITH_BINRELOC) +FILE(GLOB SRC *.c) + +BLENDERLIB(binreloc "${SRC}" "${INC}") +#, libtype=['core','player'], priority = [25,15] ) diff --git a/extern/binreloc/Makefile b/extern/binreloc/Makefile new file mode 100644 index 00000000000..dbd093500a1 --- /dev/null +++ b/extern/binreloc/Makefile @@ -0,0 +1,37 @@ +# +# ***** 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) 2008 by The Blender Foundation +# All rights reserved. +# +# + +LIBNAME = binreloc +DIR = $(OCGDIR)/extern/$(LIBNAME) + +include nan_definitions.mk + +CPPFLAGS += -I./include + + +include nan_compile.mk + + +install: all debug + @[ -d $(DIR) ] || mkdir $(DIR) + @[ -d $(DIR)/include ] || mkdir $(DIR)/include + @../../intern/tools/cpifdiff.sh include/*.h $(DIR)/include/ -- cgit v1.2.3