Skip to content

Commit 79130e1

Browse files
q4aq4a
committed
more linux porting, but still build failed at 86% in xrCore
1 parent 4af858f commit 79130e1

File tree

14 files changed

+278
-25
lines changed

14 files changed

+278
-25
lines changed

‎Externals/NVTT/src/nvcore/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SET(CORE_SRCS
2323
Library.h
2424
Library.cpp)
2525

26-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
26+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
2727

2828
# targets
2929
ADD_DEFINITIONS(-DNVCORE_EXPORTS)

‎Externals/NVTT/src/nvcore/Debug.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#endif
2929

3030
#if NV_OS_LINUX && defined(HAVE_EXECINFO_H)
31+
# include <sys/types.h>
32+
# include <unistd.h> // getpid
3133
# include <execinfo.h> // backtrace
3234
# if NV_CC_GNUC // defined(HAVE_CXXABI_H)
3335
# include <cxxabi.h>

‎Externals/NVTT/src/nvimage/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PROJECT(nvimage)
22

3-
SET(IMAGE_SRCS
3+
SET(IMAGE_SRCS
44
nvimage.h
55
FloatImage.h
66
FloatImage.cpp
@@ -27,7 +27,7 @@ SET(IMAGE_SRCS
2727
PsdFile.h
2828
TgaFile.h)
2929

30-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../nvcore ${CMAKE_CURRENT_SOURCE_DIR}/../nvmath)
30+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
3131

3232
IF(PNG_FOUND)
3333
SET(LIBS ${LIBS} ${PNG_LIBRARIES})

‎Externals/NVTT/src/nvimage/ImageIO.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileName)
135135
StdInputStream stream(fileName);
136136

137137
if (stream.isError()) {
138-
return false;
138+
return NULL;
139139
}
140140

141141
return loadFloat(fileName, stream);
@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
233233
case TGA_TYPE_INDEXED:
234234
if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
235235
nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
236-
return false;
236+
return NULL;
237237
}
238238
pal = true;
239239
break;
@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
254254

255255
default:
256256
nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
257-
return false;
257+
return NULL;
258258
}
259259

260260
const uint pixel_size = (tga.pixel_size/8);

‎Externals/NVTT/src/nvmath/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SET(MATH_SRCS
1313
Basis.h Basis.cpp
1414
Triangle.h Triangle.cpp TriBox.cpp)
1515

16-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../nvcore)
16+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
1717

1818
# targets
1919
ADD_DEFINITIONS(-DNVMATH_EXPORTS)

‎Externals/NVTT/src/nvtt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ IF(CUDA_FOUND)
3939
INCLUDE_DIRECTORIES(${CUDA_INCLUDE_PATH})
4040
ENDIF(CUDA_FOUND)
4141

42-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../nvcore ${CMAKE_CURRENT_SOURCE_DIR}/../nvimage ${CMAKE_CURRENT_SOURCE_DIR}/../nvmath)
42+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
4343

4444
ADD_DEFINITIONS(-DNVTT_EXPORTS)
4545

‎Externals/cximage/ximadef.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,16 @@ typedef unsigned char BYTE;
9898
typedef unsigned short WORD;
9999
typedef unsigned long DWORD;
100100
typedef unsigned int UINT;
101+
typedef const char* LPCTSTR;
101102

102103
typedef DWORD COLORREF;
103104
typedef unsigned int HANDLE;
104105
typedef void* HRGN;
106+
typedef void* HDC;
107+
108+
typedef int boolean;
109+
110+
#define _tfopen fopen
105111

106112
#ifndef BOOL
107113
#define BOOL bool

‎Externals/cximage/ximainfo.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
#include "ximage.h"
77

8+
#if !defined(WIN32)
9+
#define _tcsnicmp(a,b,c) strcasecmp(a,b)
10+
#endif
11+
812
////////////////////////////////////////////////////////////////////////////////
913
/**
1014
* \return the color used for transparency, and/or for background color
@@ -538,7 +542,7 @@ void CxImage::SetOffset(long x,long y)
538542
////////////////////////////////////////////////////////////////////////////////
539543
/**
540544
* \sa SetJpegQuality, GetJpegQualityF
541-
* \author [DP]; changes [Stefan Schürmans]
545+
* \author [DP]; changes [Stefan Sch?rmans]
542546
*/
543547
BYTE CxImage::GetJpegQuality() const
544548
{
@@ -547,7 +551,7 @@ BYTE CxImage::GetJpegQuality() const
547551
////////////////////////////////////////////////////////////////////////////////
548552
/**
549553
* \sa SetJpegQuality, GetJpegQuality
550-
* \author [Stefan Schürmans]
554+
* \author [Stefan Sch?rmans]
551555
*/
552556
float CxImage::GetJpegQualityF() const
553557
{
@@ -557,7 +561,7 @@ float CxImage::GetJpegQualityF() const
557561
/**
558562
* quality level for JPEG and JPEG2000
559563
* \param q: can be from 0 to 100
560-
* \author [DP]; changes [Stefan Schürmans]
564+
* \author [DP]; changes [Stefan Sch?rmans]
561565
*/
562566
void CxImage::SetJpegQuality(BYTE q){
563567
info.fQuality = (float)q;
@@ -567,7 +571,7 @@ void CxImage::SetJpegQuality(BYTE q){
567571
* quality level for JPEG and JPEG2000
568572
* necessary for JPEG2000 when quality is between 0.0 and 1.0
569573
* \param q: can be from 0.0 to 100.0
570-
* \author [Stefan Schürmans]
574+
* \author [Stefan Sch?rmans]
571575
*/
572576
void CxImage::SetJpegQualityF(float q){
573577
if (q>0) info.fQuality = q;

‎README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,11 @@ Build instructions (Windows): [doc/howto/build.txt](doc/howto/build.txt)
1414
Build instructions (Linux): [doc/howto/build-linux.txt](doc/howto/build-linux.txt)
1515

1616
Current status (Linux):
17-
[ 66%] Building CXX object Externals/cximage/CMakeFiles/cximage.dir/ximaenc.cpp.o
18-
In file included from /home/1/xray-16/Externals/cximage/ximage.h:57:0,
19-
from /home/1/xray-16/Externals/cximage/ximaenc.cpp:6:
20-
/home/1/xray-16/Externals/cximage/xiofile.h:21:12: error: ‘LPCTSTR’ has not been declared
21-
bool Open(LPCTSTR filename, LPCTSTR mode)
22-
23-
Old status (Linux):
2417
Build Failed:
25-
[ 82%] Building CXX object xrCore/CMakeFiles/xrCore.dir/clsid.cpp.o
26-
xray-16/src/xrCore/_types.h:14:24: error: expected initializer before ?s64?
27-
typedef signed __int64 s64;
28-
^~~
18+
[ 86%] Building CXX object src/xrCore/CMakeFiles/xrCore.dir/clsid.cpp.o
19+
xray-16/src/xrCore/_std_extensions.h:82:15: error: ?_fpclass? was not declared in this scope
20+
int cls = _fpclass(double(x));
21+
^~~~~~~~
2922

3023

3124
If you find a bug or have an enhancement request, file an [Issue](https://github.com/openxray/xray-16/issues).

0 commit comments

Comments
 (0)