Douglas Andreani 1 年之前
父节点
当前提交
d89ac0618b
共有 2 个文件被更改,包括 9 次插入7 次删除
  1. 4 4
      CMakeLists.txt
  2. 5 3
      src/BaseWindow.cpp

+ 4 - 4
CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.20.0)
-project(opengl-imgui-cmake-template VERSION 0.1.0)
+project(music-imgui VERSION 0.1.0)
 #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 
 set (CMAKE_CXX_STANDARD 17)
@@ -15,8 +15,8 @@ file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/*.cpp)
 
 find_library(GLFW_LIBRARY NAMES glfw3 HINTS "c:/usr/lib")
 
-add_executable(opengl-imgui-cmake-template ${SOURCES} src/main.cpp src/App.cpp src/glad.c src/Audio.cpp src/BaseWindow.cpp )
+add_executable(music-imgui ${SOURCES} src/main.cpp src/App.cpp src/glad.c src/Audio.cpp src/BaseWindow.cpp )
 
 find_package(OpenGL REQUIRED)
-target_link_libraries(opengl-imgui-cmake-template PRIVATE ${OPENGL_gl_LIBRARY})
-target_link_libraries(opengl-imgui-cmake-template PRIVATE ${GLFW_LIBRARY})
+target_link_libraries(music-imgui PRIVATE ${OPENGL_gl_LIBRARY})
+target_link_libraries(music-imgui PRIVATE ${GLFW_LIBRARY})

+ 5 - 3
src/BaseWindow.cpp

@@ -18,11 +18,13 @@ BaseWindow::BaseWindow(int width, int height, const char *title, Color clear_col
 
 BaseWindow::~BaseWindow()
 {
-    ImGui_ImplOpenGL3_Shutdown();
-    ImGui_ImplGlfw_Shutdown();
-    ImGui::DestroyContext();
+    
+    //ImGui_ImplOpenGL3_Shutdown();
+    //ImGui_ImplGlfw_Shutdown();
+    //ImGui::DestroyContext();
     glfwDestroyWindow(m_window);
     glfwTerminate();
+    
 }
 
 int BaseWindow::run()