修改makefile
This commit is contained in:
parent
4ad3a2dc7d
commit
4fbd7fa035
@ -47,11 +47,7 @@ add_executable(external namespacetest/external.cpp)
|
||||
add_executable(support namespacetest/support.cpp)
|
||||
add_executable(ststic namespacetest/ststic.cpp)
|
||||
add_executable(newplace namespacetest/newplace.cpp)
|
||||
<<<<<<< HEAD
|
||||
add_executable(namessp namespacetest/namessp.cpp)
|
||||
add_executable(usestock0 class/usestock0.cpp)
|
||||
add_executable(stock20 class/stock20.cpp)
|
||||
add_executable(useStock20 class/useStock20.cpp)
|
||||
=======
|
||||
add_executable(namessp namespacetest/namessp.cpp)
|
||||
>>>>>>> parent of 39fe553 (添加对象)
|
||||
add_executable(namessp namespacetest/namessp.cpp)
|
Loading…
Reference in New Issue
Block a user