Droog71
/
oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Linux: Makefiles updates for github project tree" 

This reverts commit f0a3c742ec.
master
KonstantinosSykas 2013-10-10 20:12:27 +03:00
parent 9edd3a14b9
commit 28bef4568c
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -32,9 +32,9 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
endif endif
else else
ifeq ($(debug),yes) ifeq ($(debug),yes)
LIBJS_ROOT = ../spidermonkey-ff4/js/src/build-debug LIBJS_ROOT = deps/mozilla/js/src/build-debug
else else
LIBJS_ROOT = ../spidermonkey-ff4/js/src/build-release LIBJS_ROOT = deps/mozilla/js/src/build-release
endif endif
LIBJS_INC_DIR = $(LIBJS_ROOT)/dist/include LIBJS_INC_DIR = $(LIBJS_ROOT)/dist/include
LIBJS_LIB_DIR = $(LIBJS_ROOT)/dist/lib LIBJS_LIB_DIR = $(LIBJS_ROOT)/dist/lib

12
GNUmakefile.postamble
View File

@ -32,18 +32,18 @@ after-all::
$(CP) $(CP_FLAGS) Resources/Config $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Config $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) Resources/Scripts $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Scripts $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) Resources/Shaders $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Shaders $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Images $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Binary/Images $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Models $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Binary/Models $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Music $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Binary/Music $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Sounds $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Binary/Sounds $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) ../oolite-binary-resources/Binary/Textures $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Resources/Binary/Textures $(PROGDIR)/Resources
$(CP) $(CP_FLAGS) Schemata $(PROGDIR)/Resources $(CP) $(CP_FLAGS) Schemata $(PROGDIR)/Resources
ifeq ($(ESPEAK),yes) ifeq ($(ESPEAK),yes)
ifeq ($(GNUSTEP_HOST_OS),mingw32) ifeq ($(GNUSTEP_HOST_OS),mingw32)
$(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources $(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
else else
ifeq ($(use_deps),yes) ifeq ($(use_deps),yes)
$(CP) $(CP_FLAGS) ../oolite-sdl-dependencies/espeak-data $(PROGDIR)/Resources $(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
endif endif
endif endif
endif endif

20
installers/posix/make_installer.sh
View File

@ -80,25 +80,25 @@ cd installers/
tar zcf ../${setup_root}/freedesktop.tar.gz FreeDesktop/ --exclude .svn tar zcf ../${setup_root}/freedesktop.tar.gz FreeDesktop/ --exclude .svn
echo "Packing $cpu_architecture architecture library dependencies..." echo "Packing $cpu_architecture architecture library dependencies..."
cd ../../oolite-linux-dependencies/${cpu_architecture}/ cd ../deps/Linux-deps/${cpu_architecture}/
tar zcf ../../oolite/${setup_root}/oolite.deps.tar.gz lib/ --exclude .svn tar zcf ../../../${setup_root}/oolite.deps.tar.gz lib/ --exclude .svn
echo "Packing documentation..." echo "Packing documentation..."
cd ../../oolite/Doc/ cd ../../../Doc/
tar cf ../${setup_root}/oolite.doc.tar AdviceForNewCommanders.pdf OoliteReadMe.pdf OoliteRS.pdf CHANGELOG.TXT tar cf ../${setup_root}/oolite.doc.tar AdviceForNewCommanders.pdf OoliteReadMe.pdf OoliteRS.pdf CHANGELOG.TXT
cd ../../oolite-linux-dependencies/ cd ../deps/Linux-deps/
tar rf ../oolite/${setup_root}/oolite.doc.tar README.TXT tar rf ../../${setup_root}/oolite.doc.tar README.TXT
gzip ../oolite/${setup_root}/oolite.doc.tar gzip ../../${setup_root}/oolite.doc.tar
echo "Packing wrapper scripts and startup README..." echo "Packing wrapper scripts and startup README..."
tar zcf ../oolite/${setup_root}/oolite.wrap.tar.gz oolite.src oolite-update.src tar zcf ../../${setup_root}/oolite.wrap.tar.gz oolite.src oolite-update.src
echo "Packing GNUstep DTDs..." echo "Packing GNUstep DTDs..."
cd ../oolite-sdl-dependencies/ cd ../Cross-platform-deps/
tar zcf ../oolite/${setup_root}/oolite.dtd.tar.gz DTDs --exclude .svn tar zcf ../../${setup_root}/oolite.dtd.tar.gz DTDs --exclude .svn
echo "Copying setup script..." echo "Copying setup script..."
cd ../oolite/installers/posix/ cd ../../installers/posix/
cat setup.header > ../../${oolite_app}/setup cat setup.header > ../../${oolite_app}/setup
if [ $trunk ] if [ $trunk ]
then then

2
libjs.make
View File

@ -11,7 +11,7 @@
include config.make include config.make
LIBJS_SRC_DIR = ../spidermonkey-ff4/js/src LIBJS_SRC_DIR = deps/mozilla/js/src
LIBJS_CONFIG_FLAGS = --disable-shared-js LIBJS_CONFIG_FLAGS = --disable-shared-js
LIBJS_CONFIG_FLAGS += --enable-threadsafe LIBJS_CONFIG_FLAGS += --enable-threadsafe
LIBJS_CONFIG_FLAGS += --with-system-nspr LIBJS_CONFIG_FLAGS += --with-system-nspr