Changeset 938187
- Timestamp:
- 02/03/12 14:51:39 (3 months ago)
- Branches:
- ('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')
- Children:
- ceec23dfed3ad0e67cef7e12bc29ef881880a79f
- Parents:
- 189ddc9383a342debf5c6388a8605e7715480a63
- git-author:
- Micke Prag <micke.prag@telldus.se>2012-02-03 14:51:39+01:00
- git-committer:
- Micke Prag <micke.prag@telldus.se>2012-02-03 14:51:39+01:00
- Location:
- telldus-core
- Files:
-
- 2 edited
- 7 moved
-
common/CMakeLists.txt (modified) (5 diffs)
-
common/Event.cpp (moved) (moved from telldus-core/service/Event.cpp)
-
common/Event.h (moved) (moved from telldus-core/service/Event.h)
-
common/EventHandler.h (moved) (moved from telldus-core/service/EventHandler.h)
-
common/EventHandler_unix.cpp (moved) (moved from telldus-core/service/EventHandler_unix.cpp)
-
common/EventHandler_win.cpp (moved) (moved from telldus-core/service/EventHandler_win.cpp)
-
common/Event_unix.cpp (moved) (moved from telldus-core/service/Event_unix.cpp)
-
common/Event_win.cpp (moved) (moved from telldus-core/service/Event_win.cpp)
-
service/CMakeLists.txt (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
telldus-core/common/CMakeLists.txt
r31a0b2 r938187 5 5 ######## Non configurable options ######## 6 6 SET( telldus-common_SRCS 7 Event.cpp 7 8 Message.cpp 8 9 Mutex.cpp … … 13 14 SET( telldus-common_HDRS 14 15 common.h 16 Event.h 17 EventHandler.h 15 18 Message.h 16 19 Mutex.h … … 30 33 ADD_DEFINITIONS( -D_MACOSX ) 31 34 LIST(APPEND telldus-common_SRCS 35 Event_unix.cpp 36 EventHandler_unix.cpp 32 37 Socket_unix.cpp 33 38 stdlibc_workaround.cpp #Remove this when we drop support for 10.5 … … 42 47 ADD_DEFINITIONS( -D_WINDOWS ) 43 48 LIST(APPEND telldus-common_SRCS 49 Event_win.cpp 50 EventHandler_win.cpp 44 51 Socket_win.cpp 45 52 ) … … 49 56 ADD_DEFINITIONS( -D_FREEBSD ) 50 57 LIST(APPEND telldus-common_SRCS 58 Event_unix.cpp 59 EventHandler_unix.cpp 51 60 Socket_unix.cpp 52 61 ) -
telldus-core/service/CMakeLists.txt
rf15fd8 r938187 19 19 Device.cpp 20 20 DeviceManager.cpp 21 Event.cpp22 21 Log.cpp 23 22 Sensor.cpp … … 79 78 Device.h 80 79 DeviceManager.h 81 Event.h82 EventHandler.h83 80 EventUpdateManager.h 84 81 Log.h … … 117 114 ConnectionListener_unix.cpp 118 115 ControllerListener_mac.cpp 119 Event_unix.cpp120 EventHandler_unix.cpp121 116 SettingsCoreFoundationPreferences.cpp 122 117 ) … … 135 130 LIST(APPEND telldus-service_SRCS 136 131 ConnectionListener_win.cpp 137 Event_win.cpp138 EventHandler_win.cpp139 132 main_win.cpp 140 133 SettingsWinRegistry.cpp … … 165 158 LIST(APPEND telldus-service_SRCS 166 159 ConnectionListener_unix.cpp 167 Event_unix.cpp168 EventHandler_unix.cpp169 160 main_unix.cpp 170 161 SettingsConfuse.cpp
Note: See TracChangeset
for help on using the changeset viewer.
