Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 1, 2009, 12:04:50 AM (15 years ago)
Author:
landauf
Message:

Moved the Orxonox executable to the root of the src directory

Location:
code/branches/libraries2/src
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/libraries2/src/CMakeLists.txt

    r5716 r5733  
    9999ADD_SUBDIRECTORY(modules)
    100100ADD_SUBDIRECTORY(orxonox)
     101
     102################ Executable ################
     103
     104# Translate argument
     105IF(ORXONOX_USE_WINMAIN)
     106  SET(ORXONOX_WIN32 WIN32)
     107ENDIF()
     108
     109ORXONOX_ADD_EXECUTABLE(orxonox-main
     110  # When defined as WIN32 this removes the console window on Windows
     111  ${ORXONOX_WIN32}
     112  LINK_LIBRARIES
     113    orxonox
     114  SOURCE_FILES
     115    Orxonox.cc
     116  OUTPUT_NAME orxonox
     117)
     118
     119GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
     120GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
     121SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
  • code/branches/libraries2/src/Orxonox.cc

    r5727 r5733  
    4545
    4646#include "util/Debug.h"
    47 #include "Main.h"
     47#include "orxonox/Main.h"
    4848
    4949/*
  • code/branches/libraries2/src/orxonox/CMakeLists.txt

    r5732 r5733  
    3131ADD_SUBDIRECTORY(sound)
    3232
    33 # Translate argument
    34 IF(ORXONOX_USE_WINMAIN)
    35   SET(ORXONOX_WIN32 WIN32)
    36 ENDIF()
    37 
    3833ORXONOX_ADD_LIBRARY(orxonox
    3934  FIND_HEADER_FILES
     
    6762)
    6863
    69 ORXONOX_ADD_EXECUTABLE(orxonox-main
    70   # When defined as WIN32 this removes the console window on Windows
    71   ${ORXONOX_WIN32}
    72   LINK_LIBRARIES
    73     orxonox
    74   SOURCE_FILES
    75     Orxonox.cc
    76   OUTPUT_NAME orxonox
    77 )
    78 
    79 GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
    80 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
    81 SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
    82 
    8364
    8465# When using Visual Studio we want to use the output directory as working
Note: See TracChangeset for help on using the changeset viewer.