Merge pull request #414 from BenjamenMeyer/enhancement_contacts_0-7-x

Enhancement: Contact documentation

README.md

@@ -610,6 +610,31 @@ Submit comments or suggestions by opening an [issue](https://github.com/vegastri
 
 And if you can design some missions it would rock!
 
+Vega Strike Contacts
+====================
+
+Vega Strike is the product of many contributors from all around the world. If you need help, find a bug, want to request a feature, etc then please contact us all using one
+of the following methods:
+
+- [Gitter.im: Community](https://gitter.im/vegastrike/community)
+- [Gitter.im: Packaging](https://gitter.im/vegastrike/vegastrike-packaging)
+- [Gitter.im: Infrastructure](https://gitter.im/vegastrike/infrastructure-admins)
+- [Mailing Lists](https://lists.vega-strike.org)
+- [Vega Strike Forums](https://forums.vega-strike.org)
+
+Bugs can be sent to one of the following:
+  - Security related issues can be sent to [[email protected]](mailto:[email protected]).
+  - General issues can be sent to [[email protected]](mailto:[email protected]) or filed as an [issue](https://github.com/vegastrike/Vega-Strike-Engine-Source/issues).
+
+Vega Strike on Social Media
+===========================
+- [Facebook](https://www.facebook.com/VegaStrike-188522714499479/)
+- [Twitter](https://twitter.com/vega_strike)
+- [YouTube](https://www.youtube.com/channel/UC5p9ObADzS3sx9orZG7M91g/)
+- [MeWe](http://www.mewe.com/join/vegastrike)
+- [Diaspora: Pluspora](https://pluspora.com/tags/vegastrike)
+
+
 Vega Strike Code Repository
 ===========================
 

engine/CMakeLists.txt

@@ -148,7 +148,7 @@ SET(LIBAI_SOURCES
     src/cmd/ai/flykeyboard_generic.cpp
 )
 
-ADD_LIBRARY(OPcollide
+ADD_LIBRARY(vegastrike-OPcollide
     src/cmd/collide2/Ice/IceAABB.cpp
     src/cmd/collide2/Ice/IceContainer.cpp
     src/cmd/collide2/Ice/IceHPoint.cpp
@@ -433,7 +433,7 @@ SET(LIBAUDIO_SOURCES
 )
 
 
-ADD_LIBRARY(engine_com
+ADD_LIBRARY(vegastrike-engine_com
     ${LIBAI_SOURCES}
     ${LIBCMD_SOURCES}
     ${LIBNET_SOURCES}
@@ -1067,7 +1067,7 @@ CONFIGURE_FILE(${Vega_Strike_SOURCE_DIR}/cmake-config.h.in ${Vega_Strike_BINARY_
 #SET(CMAKE_CXX_FLAGS "-include config.h;-pipe;"${CMAKE_CXX_FLAGS})
 
 #Setup shared lib and include listings for vegastrike.
-SET(TST_LIBS engine_com OPcollide ${TST_LIBS})
+SET(TST_LIBS vegastrike-engine_com vegastrike-OPcollide ${TST_LIBS})
 INCLUDE_DIRECTORIES(${TST_INCLUDES})
 
 TARGET_LINK_LIBRARIES(vegastrike ${TST_LIBS})
@@ -1155,7 +1155,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "7")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "VegaStrike-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-SET(CPACK_PACKAGE_EXECUTABLES "vegastrike" "mesh_tool" "vegasettings")
+SET(CPACK_PACKAGE_EXECUTABLES "vegastrike" "vega-meshtool" "vegasettings")
 SET(CPACK_CONTACT "[email protected]")
 
 IF (DEFINED ENV{TAG_NAME})
@@ -1181,7 +1181,7 @@ IF (WIN32 AND NOT UNIX)
 
     # NSIS, Wix, and compressed archives (7z, Zip)
     SET(CPACK_GENERATOR "NSIS" "NSIS64" "WIX" "7Z" "ZIP")
-    SET(CPACK_PACKAGE_EXECUTABLES "vegastrike.exe" "mesh_tool.exe" "vegasettings.exe")
+    SET(CPACK_PACKAGE_EXECUTABLES "vegastrike.exe" "vega-meshtool.exe" "vegasettings.exe")
 ELSEIF (XCODE)
     MESSAGE("-- Configuring Packaging for Mac OS X")
     # Mac OS X

engine/objconv/CMakeLists.txt

@@ -1,13 +1,13 @@
 #SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
 INCLUDE_DIRECTORIES("..")
 SET(TRISORT_SOURCES trisort.cpp)
-ADD_EXECUTABLE(trisort ${TRISORT_SOURCES})
+ADD_EXECUTABLE(vs-buildenv-trisort ${TRISORT_SOURCES})
 
 SET(ASTEROID_SOURCES asteroidgen.cpp)
-ADD_EXECUTABLE(asteroidgen ${ASTEROID_SOURCES})
+ADD_EXECUTABLE(vs-buildenv-asteroidgen ${ASTEROID_SOURCES})
 
 SET(REPLACE_SOURCES replace.cpp)
-ADD_EXECUTABLE(replace ${REPLACE_SOURCES})
+ADD_EXECUTABLE(vs-buildenv-replace ${REPLACE_SOURCES})
 
 #find Expat
 FIND_PACKAGE(EXPAT REQUIRED)
@@ -22,9 +22,9 @@ ENDIF (EXPAT_FOUND)
 IF (OGRE_FOUND)
     SET(MSH_INCLUDES ${MSH_INCLUDES} ${OGRE_INCLUDE_DIRS})
     SET(MSH_LIBS ${MSH_LIBS} ${OGRE_LIBRARIES})
-    MESSAGE("++ Compiling mesh_tool with OgreMesh support")
+    MESSAGE("++ Compiling vega-meshtool with OgreMesh support")
 ELSE (OGRE_FOUND)
-    MESSAGE("-- Compiling mesh_tool without OgreMesh support: Ogre not found")
+    MESSAGE("-- Compiling vega-meshtool without OgreMesh support: Ogre not found")
 ENDIF (OGRE_FOUND)
 
 SET(MESHER_SOURCES
@@ -48,15 +48,15 @@ SET(MESHER_SOURCES
 )
 
 INCLUDE_DIRECTORIES(${MSH_INCLUDES} mesher)
-ADD_EXECUTABLE(mesh_tool ${MESHER_SOURCES})
+ADD_EXECUTABLE(vega-meshtool ${MESHER_SOURCES})
 
 # OGRE already looked for by parent
 # USE_SYSTEM_BOOST already set by main script
 IF (OGRE_FOUND AND NOT USE_SYSTEM_BOOST)
     # Ogre usage in mesher requires boost::system
-    ADD_DEPENDENCIES(mesh_tool boost_system)
+    ADD_DEPENDENCIES(vega-meshtool boost_system)
     SET(MSH_LIBS ${MSH_LIBS} boost_system)
 ENDIF (OGRE_FOUND AND NOT USE_SYSTEM_BOOST)
 
-TARGET_LINK_LIBRARIES(mesh_tool ${MSH_LIBS})
-INSTALL(TARGETS mesh_tool DESTINATION bin)
+TARGET_LINK_LIBRARIES(vega-meshtool ${MSH_LIBS})
+INSTALL(TARGETS vega-meshtool DESTINATION bin)

script/build.sh

@@ -49,4 +49,4 @@ cd $ROOT_DIR
 
 mkdir -pv $BIN_DIR
 
-cp -v $BUILD_DIR/{vegastrike,setup/vegasettings,objconv/mesh_tool} $BIN_DIR
+cp -v $BUILD_DIR/{vegastrike,setup/vegasettings,objconv/vega-meshtool} $BIN_DIR

script/package

@@ -18,7 +18,7 @@ SRC_DIR=$ROOT_DIR/engine
 PACKAGE_DIR=$ROOT_DIR/packages
 VS_EXECUTABLE=${BUILD_DIR}/vegastrike
 VS_CONFIG_EXECUTABLE=${BUILD_DIR}/vegasettings
-VS_MESH_EXECUTABLE=${BUILD_DIR}/mesh_tool
+VS_MESH_EXECUTABLE=${BUILD_DIR}/vega-meshtool
 DEPS_LOOKUP_FILE=${BUILD_DIR}/dependency.lookup
 DEPS_FINALIZED=${BUILD_DIR}/dependency.list