Skip to content

Commit

Permalink
Build system fix
Browse files Browse the repository at this point in the history
  • Loading branch information
caiiiycuk committed Dec 2, 2024
1 parent 12ee7c1 commit 6a49a41
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 2 deletions.
1 change: 1 addition & 0 deletions lib/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ADD_EXECUTABLE(zip_convert
xzip/inzip.cpp
xzip/outzip.cpp
xzip/treezip.cpp
${PROJECT_SOURCE_DIR}/src/vss/sys-noop.cpp
)

#ADD_DEFINITIONS(-e SDL_main )
Expand Down
5 changes: 4 additions & 1 deletion server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ SET(server_SRCS
#win32f.cpp -- candidat to remove
)

ADD_EXECUTABLE(vangers_server ${server_SRCS})
ADD_EXECUTABLE(vangers_server
${server_SRCS}
${PROJECT_SOURCE_DIR}/src/vss/sys-noop.cpp
)

IF(WIN32)
SET(WIN_LIB
Expand Down
20 changes: 20 additions & 0 deletions src/vss/sys-noop.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// Created by caiiiycuk on 02.12.24.
//

void sys_initScripts(const char*) {
}

bool sys_readyQuant() {
return true;
}

void sys_runtimeObjectQuant(int) {
}

void sys_tickQuant() {
}

extern "C" const char* sys_fileOpenQuant(const char* file, unsigned) {
return file;
}
12 changes: 11 additions & 1 deletion surmap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ INCLUDE_DIRECTORIES(AFTER
"${PROJECT_SOURCE_DIR}/lib/xtool"
"${PROJECT_SOURCE_DIR}/lib/xgraph"
"${PROJECT_SOURCE_DIR}"
"${PROJECT_SOURCE_DIR}/src/vss/duktape-2.7.0"
)

SET(surmap_SRCS
Expand All @@ -26,6 +27,15 @@ SET_SOURCE_FILES_PROPERTIES(${surmap_SRCS}
"-Wno-parentheses -Wno-unused-variable -Wno-unused-parameter -Wno-register -Wno-dangling-else \
-Werror=missing-field-initializers -Werror=uninitialized")

SET(vss_SRCS
${PROJECT_SOURCE_DIR}/src/vss/sys.cpp
${PROJECT_SOURCE_DIR}/src/vss/sys-modules.cpp
${PROJECT_SOURCE_DIR}/src/vss/sys-bridge.cpp
${PROJECT_SOURCE_DIR}/src/vss/sys-quant.cpp
${PROJECT_SOURCE_DIR}/src/vss/duktape-2.7.0/duktape.c
${PROJECT_SOURCE_DIR}/src/vss/duktape-2.7.0/extras/console/duk_console.c
${PROJECT_SOURCE_DIR}/src/vss/duktape-2.7.0/extras/module-node/duk_module_node.c)

SET(vangers_surmap_SRCS
"${PROJECT_SOURCE_DIR}/src/3d/3dobject.cpp"
"${PROJECT_SOURCE_DIR}/src/3d/3d_math.cpp"
Expand All @@ -45,7 +55,7 @@ SET(vangers_surmap_SRCS
"${PROJECT_SOURCE_DIR}/src/rle.cpp"
)

ADD_EXECUTABLE(surmap ${surmap_SRCS} ${vangers_surmap_SRCS})
ADD_EXECUTABLE(surmap ${surmap_SRCS} ${vangers_surmap_SRCS} ${vss_SRCS})
SET_SOURCE_FILES_PROPERTIES(${vangers_surmap_SRCS}
PROPERTIES COMPILE_FLAGS
"-Wno-parentheses -Wno-unused-variable -Wno-unused-parameter -Wno-dangling-else")
Expand Down

0 comments on commit 6a49a41

Please sign in to comment.