Skip to content

Commit

Permalink
Merged CMekeLists.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
txwikinger committed Jul 3, 2011
1 parent db9480f commit 44004df
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ ADD_DEFINITIONS (-D WITH_SOUND)
set(EXTRA_SOURCES line.cpp sound.cpp TFuzzy.c display.cpp)

add_executable(scope main.cpp ${EXTRA_SOURCES} ${EXTRA_LIBS})
<<<<<<< HEAD
add_executable(data data.cpp)
=======
>>>>>>> 81e4603a7fb3a30b17d7a93b4042d0c2dabc224e

include_directories(/usr/include/pulse)

Expand Down

0 comments on commit 44004df

Please sign in to comment.