1
0
Fork 0

Merge branch 'next' of D:\Git_New\flightgear into next

This commit is contained in:
Vivian Meazza 2011-06-06 09:16:39 +01:00
commit b475393b1f
2 changed files with 4 additions and 4 deletions

View file

@ -130,7 +130,7 @@ if(ENABLE_LIBSVN)
endif(ENABLE_LIBSVN) endif(ENABLE_LIBSVN)
find_package(PLIB REQUIRED puaux pu js fnt) find_package(PLIB REQUIRED puaux pu js fnt)
find_package(SimGear 2.2.0 REQUIRED) find_package(SimGear 2.3.0 REQUIRED)
check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/time.h HAVE_SYS_TIME_H)

View file

@ -1,7 +1,7 @@
#FIXME: does this work in *nix/windows? #FIXME: does this work in windows?
find_package(png REQUIRED) find_package(PNG REQUIRED)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(glut REQUIRED) find_package(GLUT REQUIRED)
add_executable(fgpanel main.cxx add_executable(fgpanel main.cxx
FGGLApplication.cxx FGGLApplication.cxx