Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build on linux #24

Closed
wants to merge 2 commits into from
Closed

Build on linux #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd0da98
Add missing include
rikardfalkeborn Nov 4, 2017
7fca98d
Update configure and Makefiles for data change
rikardfalkeborn Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ EXTRA_DIST = \
splashdir = $(pkgdatadir)/splash
splash_DATA = splash.png

SUBDIRS = src data extras extras-standard textures models shaders fonts po po2 locale scripts
SUBDIRS = src data textures models shaders fonts po po2 locale scripts catalogs

# Non-automake directories
NONAUTO = admin macosx windows
Expand Down
42 changes: 26 additions & 16 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,23 +424,33 @@ AC_CONFIG_FILES([ src/celtxf/Makefile ])
AC_CONFIG_FILES([ src/celengine/Makefile ])
AC_CONFIG_FILES([ src/celephem/Makefile ])
AC_CONFIG_FILES([ src/celestia/Makefile ])
AC_CONFIG_FILES([ catalogs/Makefile ])
AC_CONFIG_FILES([ data/Makefile ])
AC_CONFIG_FILES([ extras/Makefile ])
AC_CONFIG_FILES([ extras-standard/Makefile ])
AC_CONFIG_FILES([ extras-standard/cassini/Makefile ])
AC_CONFIG_FILES([ extras-standard/cassini/models/Makefile ])
AC_CONFIG_FILES([ extras-standard/cassini/data/Makefile ])
AC_CONFIG_FILES([ extras-standard/mir/Makefile ])
AC_CONFIG_FILES([ extras-standard/mir/models/Makefile ])
AC_CONFIG_FILES([ extras-standard/galileo/Makefile ])
AC_CONFIG_FILES([ extras-standard/galileo/models/Makefile ])
AC_CONFIG_FILES([ extras-standard/galileo/data/Makefile ])
AC_CONFIG_FILES([ extras-standard/hubble/Makefile ])
AC_CONFIG_FILES([ extras-standard/hubble/models/Makefile ])
AC_CONFIG_FILES([ extras-standard/iss/Makefile ])
AC_CONFIG_FILES([ extras-standard/iss/models/Makefile ])
AC_CONFIG_FILES([ extras-standard/iss/textures/Makefile ])
AC_CONFIG_FILES([ extras-standard/iss/textures/medres/Makefile ])
AC_CONFIG_FILES([ data/locations/Makefile ])
AC_CONFIG_FILES([ data/solar-system/Makefile ])
AC_CONFIG_FILES([ data/solar-system/asteroids/Makefile ])
AC_CONFIG_FILES([ data/solar-system/comets/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/models/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/interplanetary-missions/cassini/data/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/mir/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/mir/models/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/models/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/jupiter-missions/galileo/data/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/mars-missions/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/moon-missions/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/space-observatories/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/space-observatories/hubble/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/space-observatories/hubble/models/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/models/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/textures/Makefile ])
AC_CONFIG_FILES([ data/spacecraft/near-earth-missions/iss/textures/medres/Makefile ])
AC_CONFIG_FILES([ textures/Makefile ])
AC_CONFIG_FILES([ textures/lores/Makefile ])
AC_CONFIG_FILES([ textures/medres/Makefile ])
Expand Down
2 changes: 1 addition & 1 deletion data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SUBDIRS = locations solar-system spacecrafts
SUBDIRS = locations solar-system spacecraft
1 change: 1 addition & 0 deletions src/celengine/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ extern "C" {
#include <iostream>
#include <algorithm>
#include <cmath>
#include <cstring>

using namespace std;

Expand Down