Author: mp3butcher
Date: Thu Jan 22 15:47:05 2015
New Revision: 576
URL: http://svn.gna.org/viewcvs/cal3d?rev=576&view=rev
Log:
camelcase stuff +proper debian package +fix the strange bug in callyDemo
Modified:
trunk/cal3d/CMakeLists.txt
trunk/cal3d/examples/cally/src/CMakeLists.txt
trunk/cal3d/examples/cally/src/demo.cpp
Modified: trunk/cal3d/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/CMakeLists.txt?rev=576&r1=575&r2=576&view=diff
==============================================================================
--- trunk/cal3d/CMakeLists.txt (original)
+++ trunk/cal3d/CMakeLists.txt Thu Jan 22 15:47:05 2015
@@ -192,8 +192,7 @@
INSTALL(FILES ${includefiles} DESTINATION include/cal3d)
-SET(CPACK_PACKAGE_NAME "Cal3d Library")
-SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo" "Cal3D CallyDemo")
+#SET(CPACK_PACKAGE_EXECUTABLES "callyDemo" "Cal3DcallyDemo")
#plateform specifix Package
IF(WIN32 AND NOT UNIX)
@@ -208,9 +207,9 @@
STRING(REGEX REPLACE "/" "\\\\\\\\" HOME_PROJ ${CMAKE_HOME_DIRECTORY})
SET(CPACK_NSIS_INSTALLED_ICON_NAME
"${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico")
-set(CPACK_NSIS_CREATE_ICONS "CreateShortCut
'\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CallyDemo.lnk'
'\$INSTDIR\\\\CallyDemo.exe' ''
'${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
+set(CPACK_NSIS_CREATE_ICONS "CreateShortCut
'\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\callyDemo.lnk'
'\$INSTDIR\\\\callyDemo.exe' ''
'${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
StrCmp '\$INSTALL_DESKTOP' '0' Conditionaldesktopicon
- CreateShortCut '\$desktop\\\\CallyDemo.lnk' '\$INSTDIR\\\\CallyDemo.exe'
'' '${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
+ CreateShortCut '\$desktop\\\\callyDemo.lnk' '\$INSTDIR\\\\callyDemo.exe'
'' '${HOME_PROJ}\\\\plugins\\\\src\\\\res\\\\type_bone.ico'
Conditionaldesktopicon:
")
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete
'\$SMPROGRAMS\\\\$START_MENU\\\\${PROJECT_NAME}.lnk'
@@ -221,7 +220,7 @@
SET(CPACK_PACKAGE_ICON
"${CMAKE_HOME_DIRECTORY}\\\\plugins\\\\src\\\\res\\\\cal3d.bmp")
- SET(CPACK_NSIS_INSTALLED_ICON_NAME "CallyDemo.exe")
+ SET(CPACK_NSIS_INSTALLED_ICON_NAME "callyDemo.exe")
# SET(CPACK_NSIS_INSTALLED_ICON_NAME "Cal3D")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Cal3d
Library")
SET(CPACK_NSIS_HELP_LINK "https:\\\\\\\\gna.org\\\\projects\\\\cal3d")
@@ -250,12 +249,13 @@
ELSE(WIN32 AND NOT UNIX)
+SET(CPACK_PACKAGE_NAME "libcal3d11svn-dev")
#INSTALL(FILES ${exefiles} DESTINATION bin)
INSTALL(PROGRAMS bin/miniviewer_gl DESTINATION bin)
INSTALL(PROGRAMS bin/miniviewer_gl_vp DESTINATION bin)
-INSTALL(PROGRAMS bin/CallyDemo DESTINATION bin)
-
-INSTALL(FILES ${callydatafiles} DESTINATION share/cal3d)
+INSTALL(PROGRAMS bin/callyDemo DESTINATION bin)
+
+INSTALL(FILES ${callydatafiles} DESTINATION share/cal3d/data)
INSTALL(DIRECTORY ${datafiles} DESTINATION share/cal3d)
FOREACH(item ${LIBSTOINSTALL})
@@ -285,7 +285,7 @@
#Waiting for INSTALL(FILES NAMELINK_SKIP) to work
INSTALL(FILES ${dllfiles} DESTINATION lib NAMELINK_SKIP)
-#no lacuncher CallyDemo must be run from /usr/share/cal3d FILE(GLOB
linuxlauncher "${CMAKE_CURRENT_BINARY_DIR}/Cally")
+#no lacuncher callyDemo must be run from /usr/share/cal3d FILE(GLOB
linuxlauncher "${CMAKE_CURRENT_BINARY_DIR}/Cally")
#Waiting for INSTALL(FILES NAMELINK_SKIP) to work
INSTALL(PROGRAMS ${linuxlauncher} DESTINATION .)
@@ -293,8 +293,14 @@
# There is a bug in NSI that does not handle full unix paths properly.
Make
# sure there is at least one set of four (4) backlasshes.
#SET(CPACK_PACKAGE_ICON "${Cal3D_SOURCE_DIR}/data/Cal3D.png")
- SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo" "Test Cal3DSDK")
-
+ #SET(CPACK_PACKAGE_EXECUTABLES "callyDemo" "Test Cal3DSDK")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Julien Valentin<[email protected]>")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12),
freeglut3 (>= 2.4), libglew1.10 (>=1.0)")
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Cal3d is a skeletal based 3d character
animation library written in C++ in a platform-/graphic API-independent way. It
has an unified exporter pluginframework. Provide weight based blending of
animations, actiosn and morphtargets through a mixer abstraction. Currently
this package only include development files and binaries as well as the
callyDemo which should be run from /usr/share/cal3d and OpenGL miniviewers.
For exporter plugins, checkout svn at 'http://home.gna.org/cal3d' ")
+#CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY seams buggy always replace by
CPACK_DEBIAN_PACKAGE_DESCRIPTION....??
+ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "Ce paquet contient la
bibliotheque dexecution CAL3D ainsi que quelques utilitaires.")
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE http://home.gna.org/cal3d)
+
SET(CPACK_SOURCE_STRIP_FILES "src")
set(CPACK_DEBIAN_PACKAGE_VERSION 0.12.0)
#SET(CPACK_STRIP_FILES "bin/ccmake;bin/cmake;bin/cpack;bin/ctest")
@@ -302,7 +308,7 @@
#SET(CPACK_PACKAGE_EXECUTABLES "ccmake" "CMake")
ENDIF(WIN32 AND NOT UNIX)
-#SET(CPACK_PACKAGE_EXECUTABLES "CallyDemo;miniviewer_gl")
+#SET(CPACK_PACKAGE_EXECUTABLES "callyDemo;miniviewer_gl")
INCLUDE(CPack)
#ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
Modified: trunk/cal3d/examples/cally/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/cally/src/CMakeLists.txt?rev=576&r1=575&r2=576&view=diff
==============================================================================
--- trunk/cal3d/examples/cally/src/CMakeLists.txt (original)
+++ trunk/cal3d/examples/cally/src/CMakeLists.txt Thu Jan 22 15:47:05 2015
@@ -1,4 +1,4 @@
-PROJECT(CallyDemo)
+PROJECT(callyDemo)
#ADD_DEFINITIONS(-Dx64BIT)
@@ -46,10 +46,10 @@
ENDIF(WIN32)
-ADD_EXECUTABLE(CallyDemo ${PROJECT_SOURCES} )
-TARGET_LINK_LIBRARIES(CallyDemo cal3d ${ADDITIONALS_LIBS} ${GLUT_LIBRARY}
+ADD_EXECUTABLE(callyDemo ${PROJECT_SOURCES} )
+TARGET_LINK_LIBRARIES(callyDemo cal3d ${ADDITIONALS_LIBS} ${GLUT_LIBRARY}
)
-SET_TARGET_PROPERTIES(CallyDemo PROPERTIES PROJECT_LABEL "Demo Cally" )
+SET_TARGET_PROPERTIES(callyDemo PROPERTIES PROJECT_LABEL "Demo Cally" )
Modified: trunk/cal3d/examples/cally/src/demo.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/cally/src/demo.cpp?rev=576&r1=575&r2=576&view=diff
==============================================================================
--- trunk/cal3d/examples/cally/src/demo.cpp (original)
+++ trunk/cal3d/examples/cally/src/demo.cpp Thu Jan 22 15:47:05 2015
@@ -8,6 +8,22 @@
// any later version.
//
//----------------------------------------------------------------------------//
+#ifndef WIN32
+//Inconsistency detected by ld.so: dl-version.c: 224: _dl_check_map_versions:
Assertion `needed != ((void *)0)' failed!
+///http://stackoverflow.com/questions/20007961/error-running-a-compiled-c-file-uses-opengl-error-inconsistency-detected
+//if you find better solution let me know...:/
+#include <string.h>
+#include <stdint.h>
+#include <pthread.h>
+void junk() {
+ int i;
+ i=pthread_getconcurrency();
+};
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#if defined(_MSC_VER) && _MSC_VER <= 0x0600
#pragma warning(disable : 4786)
#endif
_______________________________________________
Cal3d-commits mailing list
[email protected]
https://mail.gna.org/listinfo/cal3d-commits
