spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update lua to 5.3, fix compile

pull/402/head
Li Linfeng 2019-09-11 23:02:55 +08:00
parent 9c9a80526f
commit 6ba3058edf
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/Util.h
View File

@ -6,6 +6,7 @@
// Copyright 2005 Chris Laurel. All rights reserved.
//
#include <libintl.h>
#ifndef gettext
#include "POSupport.h"
#define gettext(s) localizedUTF8String(s)

18
macosx/celestia.xcodeproj/project.pbxproj
View File

@ -45,12 +45,14 @@
88654A260DB29585007C8027 /* celx_rotation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88654A130DB29585007C8027 /* celx_rotation.cpp */; };
88654A280DB29585007C8027 /* celx_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88654A150DB29585007C8027 /* celx_vector.cpp */; };
9708E6A92312A8BB0015C9F4 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9708E6A72312A8B00015C9F4 /* libjpeg.a */; };
970AEE8E2329417000E9ED22 /* liblua5.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 970AEE8D2329417000E9ED22 /* liblua5.3.a */; };
970AEE90232943D300E9ED22 /* libintl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 970AEE8F232943D300E9ED22 /* libintl.a */; };
970AEE92232943DC00E9ED22 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 970AEE91232943DC00E9ED22 /* libiconv.tbd */; };
978EBA922324D0740025C9D5 /* ConfigSelectionWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 978EBA912324D0740025C9D5 /* ConfigSelectionWindow.xib */; };
9798FB522324D2BE007F92B8 /* ConfigSelectionWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9798FB502324D2BE007F92B8 /* ConfigSelectionWindowController.m */; };
97E4018123101501002013C7 /* cspice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4EEA6D0F50144A003341A2 /* cspice.a */; };
97E4018323101501002013C7 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97E4018223101501002013C7 /* libpng.a */; };
97E401852310150F002013C7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 97E401842310150F002013C7 /* libz.tbd */; };
97E40189231015AD002013C7 /* liblua5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97E40188231015AD002013C7 /* liblua5.1.a */; };
CE5203030F4F9DD0007D0DE8 /* spiceinterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5202FD0F4F9DD0007D0DE8 /* spiceinterface.cpp */; };
CE5203040F4F9DD0007D0DE8 /* spiceorbit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5202FF0F4F9DD0007D0DE8 /* spiceorbit.cpp */; };
CE5203050F4F9DD0007D0DE8 /* spicerotation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5203010F4F9DD0007D0DE8 /* spicerotation.cpp */; };
@ -536,6 +538,9 @@
9708E6A12312A8310015C9F4 /* jpeglib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jpeglib.h; path = include/jpeglib.h; sourceTree = "<group>"; };
9708E6A22312A8310015C9F4 /* jconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jconfig.h; path = include/jconfig.h; sourceTree = "<group>"; };
9708E6A72312A8B00015C9F4 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; };
970AEE8D2329417000E9ED22 /* liblua5.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua5.3.a; path = lib/liblua5.3.a; sourceTree = "<group>"; };
970AEE8F232943D300E9ED22 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = lib/libintl.a; sourceTree = "<group>"; };
970AEE91232943DC00E9ED22 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
9726813A231D0D930014C8D7 /* Celestia.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Celestia.entitlements; sourceTree = "<group>"; };
978EBA912324D0740025C9D5 /* ConfigSelectionWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConfigSelectionWindow.xib; sourceTree = "<group>"; };
9798FB4F2324D2BE007F92B8 /* ConfigSelectionWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConfigSelectionWindowController.h; sourceTree = "<group>"; };
@ -1049,11 +1054,13 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
970AEE92232943DC00E9ED22 /* libiconv.tbd in Frameworks */,
97E401852310150F002013C7 /* libz.tbd in Frameworks */,
E564312B07769C9000E2C4A3 /* Cocoa.framework in Frameworks */,
E564312C07769C9000E2C4A3 /* OpenGL.framework in Frameworks */,
E5C9ADE10848FFEF0071B1EE /* Carbon.framework in Frameworks */,
97E40189231015AD002013C7 /* liblua5.1.a in Frameworks */,
970AEE8E2329417000E9ED22 /* liblua5.3.a in Frameworks */,
970AEE90232943D300E9ED22 /* libintl.a in Frameworks */,
9708E6A92312A8BB0015C9F4 /* libjpeg.a in Frameworks */,
97E4018323101501002013C7 /* libpng.a in Frameworks */,
97E4018123101501002013C7 /* cspice.a in Frameworks */,
@ -1206,6 +1213,9 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
970AEE91232943DC00E9ED22 /* libiconv.tbd */,
970AEE8F232943D300E9ED22 /* libintl.a */,
970AEE8D2329417000E9ED22 /* liblua5.3.a */,
97E40188231015AD002013C7 /* liblua5.1.a */,
9708E6A72312A8B00015C9F4 /* libjpeg.a */,
97E401842310150F002013C7 /* libz.tbd */,
@ -2402,6 +2412,7 @@
"LUA_VER=0x050100",
USE_SPICE,
JPEG_SUPPORT,
"LUA_VER=0x050305",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
@ -2465,6 +2476,7 @@
"LUA_VER=0x050100",
USE_SPICE,
JPEG_SUPPORT,
"LUA_VER=0x050305",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
@ -2646,6 +2658,7 @@
USE_HDR,
HDR_COMPRESS,
JPEG_SUPPORT,
"LUA_VER=0x050305",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
@ -2671,6 +2684,7 @@
USE_HDR,
HDR_COMPRESS,
JPEG_SUPPORT,
"LUA_VER=0x050305",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;

2
src/cel3ds/3dsread.cpp
View File

@ -116,7 +116,7 @@ void indent()
}
#ifdef DEBUG
void logChunk(uint16 chunkType/*, int chunkSize*/)
void logChunk(uint16 chunkType, int chunkSize)
{
const char* name = NULL;