Skip to content

Commit fa8cb46

Browse files
eagleivgeagleivg
committed
travis: add library instalation
add CMakeLists.txt for xrRenderPC_GL xr_3da, fixed depency in xrAPI, xrCore, xrEngine, xrSound
1 parent e563333 commit fa8cb46

File tree

13 files changed

+141
-12
lines changed

13 files changed

+141
-12
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ os:
88
- linux
99
before_script:
1010
- g++ --version
11-
- sudo apt-get install libegl1-mesa-dev libgles2-mesa-dev
11+
- sudo apt-get install libegl1-mesa-dev libgles2-mesa-dev libpugixml-dev libopenal-dev libtbb-dev
1212
- sudo apt-get install cmake lua5.1-dev libssl-dev libogg-dev libtheora-dev libvorbis-dev libsdl2-dev liblzo2-dev libjpeg-dev libncurses5-dev
1313
- mkdir bin
1414
- cd bin

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
add_subdirectory(utils)
22
add_subdirectory(Layers)
3+
#add_subdirectory(xr_3da)
34
#add_subdirectory(xrMisc)
45
#add_subdirectory(xrAICore)
56
add_subdirectory(xrCDB)

‎src/Common/PlatformLinux.inl‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,28 @@ typedef struct {
131131
WORD cbSize;
132132
} WAVEFORMATEX, *LPWAVEFORMATEX;
133133

134+
typedef struct tagSTICKYKEYS
135+
{
136+
DWORD cbSize;
137+
DWORD dwFlags;
138+
} STICKYKEYS, *LPSTICKYKEYS;
139+
140+
typedef struct tagFILTERKEYS
141+
{
142+
UINT cbSize;
143+
DWORD dwFlags;
144+
DWORD iWaitMSec;
145+
DWORD iDelayMSec;
146+
DWORD iRepeatMSec;
147+
DWORD iBounceMSec;
148+
} FILTERKEYS, *LPFILTERKEYS;
149+
150+
typedef struct tagTOGGLEKEYS
151+
{
152+
DWORD cbSize;
153+
DWORD dwFlags;
154+
} TOGGLEKEYS, *LPTOGGLEKEYS;
155+
134156
typedef struct _EXCEPTION_POINTERS {
135157
} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS;
136158

‎src/Layers/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
add_subdirectory(xrAPI)
2+
#add_subdirectory(xrRenderPC_R1)
3+
#add_subdirectory(xrRenderPC_R2)
4+
#add_subdirectory(xrRenderPC_R3)
5+
#add_subdirectory(xrRenderPC_R4)
6+
#add_subdirectory(xrRenderPC_GL)

‎src/Layers/xrAPI/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
project(xrAPI)
2+
13
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include)
24

3-
add_library(xrAPI SHARED "xrAPI.cpp" "stdafx.h")
5+
add_definitions(-DXRAPI_EXPORTS)
46

5-
set_target_properties(xrAPI PROPERTIES PREFIX "")
7+
add_library(${PROJECT_NAME} SHARED "xrAPI.cpp" "stdafx.h")
8+
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")

‎src/Layers/xrRenderPC_GL/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
project(xrRenderPC_GL)
2+
3+
list(APPEND DIRS
4+
"."
5+
)
6+
7+
8+
add_dir("${DIRS}")
9+
10+
include_directories(
11+
${CMAKE_CURRENT_SOURCE_DIR}/../..
12+
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
13+
${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
14+
)
15+
16+
#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
17+
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")
18+
19+
add_definitions(-DXRLCUTIL_EXPORTS -D_USRDLL -DXRRENDER_GL_EXPORTS -DUSE_OGL -DNO_XR_VDECLARATOR)
20+
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
21+
22+
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
23+
target_link_libraries(${PROJECT_NAME} xrCore luabind LuaJIT xrCDB xrEngine xrParticles xrScriptEngine xrAPI)

‎src/xrCore/CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,10 @@ add_definitions(-DXRCORE_EXPORTS)
2222
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2323

2424
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
25-
target_link_libraries(${PROJECT_NAME} ${SDL2_LIB} ${OPENSSL_LIBRARIES} ${LZO_LIBRARY} ${CRYPTO_LIBRARY} ${PUGIXML_LIBRARY})
25+
#Заглушки, пока не починю find_package
26+
set(CRYPTO_LIBRARY crypto++)
27+
set(PUGIXML_LIBRARY pugixml)
28+
set(TBB_LIBRARIES tbb tbbmalloc_proxy tbbmalloc)
29+
set(SDL2_LIB SDL2)
30+
31+
target_link_libraries(${PROJECT_NAME} ${SDL2_LIB} ${LZO_LIBRARY} ${CRYPTO_LIBRARY} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})

‎src/xrCore/string_concatenations.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#include "string_concatenations.h"
33

44
#if defined(LINUX)
5-
#define EXCEPTION_STACK_OVERFLOW ((DWORD) 0xC00000FD)
6-
#define EXCEPTION_EXECUTE_HANDLER 1
7-
#define EXCEPTION_CONTINUE_SEARCH 0
8-
95
int _cdecl _resetstkoflw(void)
106
{
117
int stack_addr;

‎src/xrCore/string_concatenations.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
#ifndef STRING_CONCATENATIONS_H
22
#define STRING_CONCATENATIONS_H
33

4+
#if defined(LINUX)
5+
#define EXCEPTION_STACK_OVERFLOW ((DWORD) 0xC00000FD)
6+
#define EXCEPTION_EXECUTE_HANDLER 1
7+
#define EXCEPTION_CONTINUE_SEARCH 0
8+
9+
int _cdecl _resetstkoflw(void);
10+
#endif
11+
412
#if 1//ndef _EDITOR
513

614
pstr XRCORE_API strconcat(int dest_sz, pstr dest, pcstr S1, pcstr S2);

‎src/xrEngine/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ add_definitions(-DENGINE_BUILD)
2020
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2121

2222
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
23-
target_link_libraries(${PROJECT_NAME} xrCore luabind xrAPI xrSound xrScriptEngine LuaJIT xrCDB xrPhysics)
23+
target_link_libraries(${PROJECT_NAME} xrCore luabind xrAPI xrSound xrScriptEngine luajit theora ${OGG_LIBRARIES} xrNetServer xrCDB xrPhysics openal)

0 commit comments

Comments
 (0)