so moved them up in the file
now setting target machine for linker, or we get in trouble at least
with static libs on x64
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1118
7f0cb862-5218-0410-a997-
914c9d46530a
src/fg_geometry.c
src/fg_menu.c
src/fg_teapot.c
src/fg_geometry.c
src/fg_menu.c
src/fg_teapot.c
src/mswin/fg_state_mswin.c
src/mswin/fg_structure_mswin.c
src/mswin/fg_window_mswin.c
src/mswin/fg_state_mswin.c
src/mswin/fg_structure_mswin.c
src/mswin/fg_window_mswin.c
+ freeglut.rc
+ )
+ IF (NOT CMAKE_CL_64)
+ # .def file only for 32bit Windows builds
+ LIST(APPEND FREEGLUT_SRCS
+ src/freeglutdll.def
+ )
+ ENDIF()
+
ELSEIF(ANDROID)
LIST(APPEND FREEGLUT_SRCS
src/egl/fg_internal_egl.h
ELSEIF(ANDROID)
LIST(APPEND FREEGLUT_SRCS
src/egl/fg_internal_egl.h
src/android/fg_window_android.c
src/android/opengles_stubs.c
src/android/fg_internal_android.h
src/android/fg_window_android.c
src/android/opengles_stubs.c
src/android/fg_internal_android.h
ELSE()
LIST(APPEND FREEGLUT_SRCS
src/x11/fg_cursor_x11.c
ELSE()
LIST(APPEND FREEGLUT_SRCS
src/x11/fg_cursor_x11.c
src/x11/fg_structure_x11.c
src/x11/fg_window_x11.c
src/x11/fg_xinput_x11.c
src/x11/fg_structure_x11.c
src/x11/fg_window_x11.c
src/x11/fg_xinput_x11.c
ENDIF()
# Neatly organize all of the output files in the build directory
ENDIF()
# Neatly organize all of the output files in the build directory
IF(WIN32)
LIST(APPEND LIBS winmm)
IF(BUILD_SHARED_LIBS)
IF(WIN32)
LIST(APPEND LIBS winmm)
IF(BUILD_SHARED_LIBS)
- LIST(APPEND FREEGLUT_SRCS freeglut.rc)
- IF (NOT CMAKE_CL_64)
- # .def file only for 32bit Windows builds
- LIST(APPEND FREEGLUT_SRCS src/Common/freeglutdll.def)
- ENDIF()
SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
+ IF (CMAKE_CL_64)
+ # 64bit build
+ SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+ ELSE()
+ # 32bit build
+ SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
+ ENDIF()
ENDIF()
IF(BUILD_STATIC_LIBS)
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
ENDIF()
IF(BUILD_STATIC_LIBS)
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
+ IF (CMAKE_CL_64)
+ # 64bit build
+ SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+ ELSE()
+ # 32bit build
+ SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
+ ENDIF()
ENDIF()
ELSE()
# on UNIX we need to make sure:
ENDIF()
ELSE()
# on UNIX we need to make sure:
EXPORTS
glutInit
glutInitWindowPosition
EXPORTS
glutInit
glutInitWindowPosition
glutInitContextFlags
glutInitContextVersion
glutInitContextProfile
glutInitContextFlags
glutInitContextVersion
glutInitContextProfile
- glutInitErrorFunc
- glutInitWarningFunc
+ glutInitErrorFunc
+ glutInitWarningFunc
__glutInitWithExit
__glutCreateWindowWithExit
__glutCreateMenuWithExit
__glutInitWithExit
__glutCreateWindowWithExit
__glutCreateMenuWithExit