FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix package management compiling with linux

Browse Source
This commit is contained in:
Thomas Geymayer
2013-02-21 14:03:08 +01:00
parent a530712491
commit 06bfa4f1a1
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/package/CMakeLists.txt
+1 -1
View File
@@ -23,8 +23,8 @@ if (SIMGEAR_SHARED)
set(APP_LIBS SimGearCore) set(APP_LIBS SimGearCore)
else() else()
set(APP_LIBS set(APP_LIBS
${LibArchive_LIBRARIES}
SimGearCore SimGearCore
${LibArchive_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${WINSOCK_LIBRARY} ${WINSOCK_LIBRARY}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
simgear/package/Catalog.cxx
+1
View File
@@ -3,6 +3,7 @@
#include <simgear/package/Catalog.hxx> #include <simgear/package/Catalog.hxx>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <algorithm>
#include <fstream> #include <fstream>
#include <cstring> #include <cstring>
simgear/package/Root.cxx
+1 -1
View File
@@ -78,7 +78,7 @@ Package* Root::getPackageById(const std::string& aName) const
size_t lastDot = aName.rfind('.'); size_t lastDot = aName.rfind('.');
Package* pkg = NULL; Package* pkg = NULL;
if (lastDot == -1) { if (lastDot == std::string::npos) {
// naked package ID // naked package ID
CatalogDict::const_iterator it = m_catalogs.begin(); CatalogDict::const_iterator it = m_catalogs.begin();
for (; it != m_catalogs.end(); ++it) { for (; it != m_catalogs.end(); ++it) {