[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59846] trunk/blender/intern/ghost/test: Ghost test application could be compiled again

Sergey Sharybin sergey.vfx at gmail.com
Thu Sep 5 18:22:07 CEST 2013


Revision: 59846
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59846
Author:   nazgul
Date:     2013-09-05 16:22:07 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Ghost test application could be compiled again

Was an IRC request to have Ghost application up
and running for investigation purposes.

Modified Paths:
--------------
    trunk/blender/intern/ghost/test/CMakeLists.txt

Added Paths:
-----------
    trunk/blender/intern/ghost/test/multitest/stubs.c

Modified: trunk/blender/intern/ghost/test/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/test/CMakeLists.txt	2013-09-05 16:15:01 UTC (rev 59845)
+++ trunk/blender/intern/ghost/test/CMakeLists.txt	2013-09-05 16:22:07 UTC (rev 59846)
@@ -4,6 +4,10 @@
 
 cmake_minimum_required(VERSION 2.8)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../..//build_files/cmake/Modules")
+
+set(WITH_GUARDEDALLOC ON)
+
 # -----------------------------------------------------------------------------
 # Macros
 
@@ -33,7 +37,22 @@
 	unset(_file)
 endmacro()
 
+macro(data_to_c
+      file_from file_to
+      list_to_add)
 
+	list(APPEND ${list_to_add} ${file_to})
+
+	get_filename_component(_file_to_path ${file_to} PATH)
+
+	add_custom_command(
+		OUTPUT ${file_to}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+		COMMAND ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+		DEPENDS ${file_from} datatoc)
+	unset(_file_to_path)
+endmacro()
+
 # -----------------------------------------------------------------------------
 # Defines
 
@@ -52,7 +71,6 @@
 	unset(_SYSTEM_BIG_ENDIAN)
 endif()
 
-
 # -----------------------------------------------------------------------------
 # Libraries
 
@@ -84,23 +102,36 @@
 include_directories(${INC_NEW})
 add_library(blenfont_lib ${SRC_NEW})
 
+# wcwidth
+include(${CMAKE_SOURCE_DIR}/../../../extern/wcwidth/CMakeLists.txt)
+suffix_relpaths(INC_NEW "${INC}" "../../../extern/wcwidth/")
+suffix_relpaths(SRC_NEW "${SRC}" "../../../extern/wcwidth/")
+include_directories(${INC_NEW})
+add_library(wcwidth_lib ${SRC_NEW})
+
 # grr, blenfont needs BLI
 include_directories(
 		"../../../source/blender/blenlib"
 		)
 add_library(bli_lib 
 		"../../../source/blender/blenlib/intern/fileops.c"
+		"../../../source/blender/blenlib/intern/gsqueue.c"
 		"../../../source/blender/blenlib/intern/rct.c"
 		"../../../source/blender/blenlib/intern/string.c"
 		"../../../source/blender/blenlib/intern/string_utf8.c"
 		"../../../source/blender/blenlib/intern/listbase.c"
+		"../../../source/blender/blenlib/intern/math_color.c"
 		"../../../source/blender/blenlib/intern/storage.c"
+		"../../../source/blender/blenlib/intern/threads.c"
+		"../../../source/blender/blenlib/intern/time.c"
 		"../../../source/blender/blenlib/intern/path_util.c"
 		"../../../source/blender/blenlib/intern/BLI_dynstr.c"
 		"../../../source/blender/blenlib/intern/BLI_linklist.c"
 		"../../../source/blender/blenlib/intern/BLI_memarena.c"
+		"../../../source/blender/blenlib/intern/BLI_mempool.c"
 		)
 
+set(PLATFORM_CGLAGS)
 
 find_package(OpenGL REQUIRED)
 
@@ -113,18 +144,38 @@
 include_directories(${FREETYPE_INCLUDE_DIRS})
 include_directories(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont)
 
+if(CMAKE_COMPILER_IS_GNUCC)
+	set(PLATFORM_CFLAGS "-funsigned-char")
+endif()
+
 if(UNIX AND NOT APPLE)
 	find_package(X11 REQUIRED)
+	find_package(GLEW)
 
+	if(NOT GLEW_FOUND)
+		message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
+	endif()
+
 	set(PLATFORM_LINKLIBS
 		${X11_X11_LIB}
 		${X11_Xinput_LIB}
+		${GLEW_LIBRARY}
+		-lpthread
 	)
+else()
+	# set(GLEW_LIBRARY "")  # unused
+	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
 endif()
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
+
 # -----------------------------------------------------------------------------
 # Executables
 
+# DataToC
+add_executable(datatoc
+		${CMAKE_SOURCE_DIR}/../../../source/blender/datatoc/datatoc.c)
 
 # Gears (C)
 add_executable(gears_c
@@ -153,22 +204,29 @@
 
 
 # MultiTest (C)
+set(data_to_c_files)
+data_to_c(${CMAKE_SOURCE_DIR}/../../../release/datafiles/bfont.ttf
+          ${CMAKE_CURRENT_BINARY_DIR}/bfont.ttf.c data_to_c_files)
+
 add_executable(multitest_c
-	${CMAKE_SOURCE_DIR}/../../../source/blender/editors/datafiles/bfont.ttf.c
 	${CMAKE_SOURCE_DIR}/multitest/Basic.c
 	${CMAKE_SOURCE_DIR}/multitest/EventToBuf.c
 	${CMAKE_SOURCE_DIR}/multitest/MultiTest.c
 	${CMAKE_SOURCE_DIR}/multitest/ScrollBar.c
 	${CMAKE_SOURCE_DIR}/multitest/Util.c
 	${CMAKE_SOURCE_DIR}/multitest/WindowData.c
+	${CMAKE_SOURCE_DIR}/multitest/stubs.c
+	${data_to_c_files}
 )
 
+
 target_link_libraries(multitest_c
 		blenfont_lib
 		bli_lib
 		ghost_lib
 		string_lib
 		guardedalloc_lib
+		wcwidth_lib
 		${OPENGL_gl_LIBRARY}
 		${OPENGL_glu_LIBRARY}
 		${FREETYPE_LIBRARY}

Added: trunk/blender/intern/ghost/test/multitest/stubs.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/stubs.c	                        (rev 0)
+++ trunk/blender/intern/ghost/test/multitest/stubs.c	2013-09-05 16:22:07 UTC (rev 59846)
@@ -0,0 +1,36 @@
+/*
+ * ***** 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) 2013 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+
+#include "BLI_utildefines.h"
+#include "IMB_imbuf.h"
+
+struct ImBuf;
+
+void IMB_freeImBuf(struct ImBuf *UNUSED(ibuf)) {}
+void IMB_colormanagement_display_to_scene_linear_v3(float UNUSED(pixel[3]), struct ColorManagedDisplay *UNUSED(display)) {}




More information about the Bf-blender-cvs mailing list