diff --git a/.gitignore b/.gitignore index 8326e08..fb4dafb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.o build/ +build-win/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c5a2124..84e427a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ add_executable(couch ${sources}) include_directories(core) target_link_libraries(couch glfw) target_link_libraries(couch OpenGL::GL) -target_link_libraries(couch GLEW) -target_link_libraries(couch lua) +target_link_libraries(couch GLEW::GLEW) +target_link_libraries(couch ${LUA_LIBRARIES}) file(COPY shaders DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) @@ -32,6 +32,7 @@ swig_add_library(couchlua TYPE STATIC LANGUAGE lua SOURCES scripting/couch.i) +target_link_libraries(couchlua ${LUA_LIBRARIES}) target_link_libraries(couch couchlua) diff --git a/common.mk b/common.mk deleted file mode 100644 index f20804c..0000000 --- a/common.mk +++ /dev/null @@ -1,3 +0,0 @@ -CXX := g++ -CXXFLAGS := `pkg-config --cflags gl glew glfw3 lua` -fPIC -g -LIBS := `pkg-config --libs gl glew glfw3 lua`