fixed non encountered for errors by configurator
This commit is contained in:
4
.vscode/launch.json
vendored
4
.vscode/launch.json
vendored
@@ -9,7 +9,7 @@
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"MIMode": "gdb",
|
||||
"program": "${workspaceFolder}/bin/DemoProject",
|
||||
"program": "${workspaceFolder}/bin/PlanetExplorerGameDemo",
|
||||
"preLaunchTask": "build_debug_linux",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
@@ -20,7 +20,7 @@
|
||||
"type": "cppvsdbg",
|
||||
"request": "launch",
|
||||
//"MIMode": "gdb",
|
||||
"program": "${workspaceFolder}/bin/DemoProject",
|
||||
"program": "${workspaceFolder}/bin/PlanetExplorerGameDemo",
|
||||
"preLaunchTask": "build_debug_linux",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
|
||||
@@ -30,7 +30,6 @@ add_subdirectory(TSE/TSE_Core)
|
||||
add_subdirectory(TSE/TSE_Editor)
|
||||
add_subdirectory(TSE/TSE_GlfwImpl)
|
||||
add_subdirectory(TSE/TSE_GlfwOpenGlImpl)
|
||||
find_package(Lua 5.4 REQUIRED)
|
||||
|
||||
#source files
|
||||
file(GLOB CPP_SOURCE
|
||||
@@ -64,8 +63,6 @@ include_directories(${PROJECT_SOURCE_DIR}/TSE/TSE_GlfwOpenGlImpl/include)
|
||||
#project def
|
||||
add_executable(PlanetExplorerGameDemo ${CPP_SOURCE})
|
||||
|
||||
target_include_directories(PlanetExplorerGameDemo PRIVATE ${LUA_INCLUDE_DIR})
|
||||
|
||||
if (WIN32)
|
||||
if(DEBUG)
|
||||
set(DEBUGSPEC
|
||||
@@ -82,7 +79,6 @@ if (WIN32)
|
||||
"${PROJECT_SOURCE_DIR}/TSE/TSE_GlfwImpl/include/glfw3.lib"
|
||||
# "${PROJECT_SOURCE_DIR}/../TSE.Core/lib/freetype.lib"
|
||||
"${DEBUGSPEC}"
|
||||
"${LUA_LIBRARIES}"
|
||||
)
|
||||
else()
|
||||
set(LIB_SOURCE
|
||||
@@ -90,7 +86,6 @@ else()
|
||||
"${PROJECT_SOURCE_DIR}/TSE/TSE_Core/include/libfreeimage.a"
|
||||
"${PROJECT_SOURCE_DIR}/TSE/TSE_GlfwImpl/include/libglfw3.a"
|
||||
"${PROJECT_SOURCE_DIR}/TSE/TSE_Core/include/libbox2d.a"
|
||||
"${LUA_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -57,6 +57,19 @@ fi
|
||||
echo "Updating globalVars.hpp..."
|
||||
sed -i "s/DemoProject/$PROJECT_NAME/g" "$GLOBAL_VARS_PATH"
|
||||
|
||||
# -----------------------------
|
||||
# launch.json anpassen
|
||||
# -----------------------------
|
||||
GLOBAL_VARS_PATH=".vscode/launch.json"
|
||||
|
||||
if [ ! -f "$GLOBAL_VARS_PATH" ]; then
|
||||
echo "globalVars.hpp not found in root."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Updating globalVars.hpp..."
|
||||
sed -i "s/DemoProject/$PROJECT_NAME/g" "$GLOBAL_VARS_PATH"
|
||||
|
||||
# -----------------------------
|
||||
# Git Submodule aktualisieren
|
||||
# -----------------------------
|
||||
|
||||
Reference in New Issue
Block a user