File fix-celestia_pro.patch of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

File fix-celestia_pro.patch of Package celestia (Revision 8f47c647d0afdfad1987d2434e7408e3)

Currently displaying revision 8f47c647d0afdfad1987d2434e7408e3 , Show latest

diff -ruNp a/celestia.pro b/celestia.pro
--- a/celestia.pro
+++ b/celestia.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = Celestia_QT
+TARGET = celestia
 VERSION = 1.7.0
 DESTDIR = .
 OBJECTS_DIR = obj
@@ -296,6 +296,7 @@ ENGINE_HEADERS = \
     src/celengine/virtualtex.h \
     src/celengine/visibleregion.h
 
+contains(CONFIG, WITH_SPICE) {
 SPICE_SOURCES = \
     src/celephem/spiceinterface.cpp \
     src/celephem/spiceorbit.cpp \
@@ -305,6 +306,7 @@ SPICE_HEADERS = \
     src/celephem/spiceinterface.h \
     src/celephem/spiceorbit.h \
     src/celephem/spicerotation.h
+}
 
 #### App sources ####
 
@@ -415,11 +417,12 @@ THIRDPARTY_HEADERS = $$GLEW_HEADERS $$CU
 
 DEFINES += GLEW_STATIC
 
+contains(CONFIG, WITH_SPICE) {
 # SPICE support
 EPHEM_SOURCES += $$SPICE_SOURCES
 EPHEM_HEADERS += $$SPICE_HEADERS
 DEFINES += USE_SPICE
-
+}
 
 SOURCES = \
     $$UTIL_SOURCES \
@@ -607,8 +610,12 @@ unix {
     isEmpty (LUAPC) {error("No shared Lua library found!")}
 
     PKGCONFIG += glu $$LUAPC libpng theora
-    INCLUDEPATH += /usr/local/cspice/include
-    LIBS += -ljpeg /usr/local/cspice/lib/cspice.a
+    LIBS += -ljpeg
+
+    contains(CONFIG, WITH_SPICE) {
+        INCLUDEPATH += /usr/include/cspice
+        LIBS += -lcspice
+    }
 }
 
 macx {
@@ -692,7 +699,9 @@ unix {
     target.path =$$BINDIR
 
     data.path   = $$WORKDIR/data
-    data.files  = $$CATALOG_SOURCE/*
+    data.files  = data/*
+    catalogs.path   = $$WORKDIR/catalogs
+    catalogs.files  = catalogs/*
     flares.path     = $$WORKDIR/textures
     flares.files   += textures/*.jpg textures/*.png
     textures.path   = $$WORKDIR/textures/medres
@@ -743,7 +752,7 @@ unix {
     icon128.path = /usr/share/icons/hicolor/128x128/apps
     icon128.files += src/celestia/qt/data/celestia.png
 
-    INSTALLS += target data textures lores_textures hires_textures \
+    INSTALLS += target data catalogs textures lores_textures hires_textures \
     flares models shaders fonts scripts locale extras extras-standard \
     configuration desktop icon128
 }

Places

File fix-celestia_pro.patch of Package celestia (Revision 8f47c647d0afdfad1987d2434e7408e3)

Places