r286 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-05-18 14:26:14 -0400 (Fri, 18 May 2007)
New Revision: 286

Modified:
   trunk/CMakeLists.txt
Log:
Renamed the shared libraries so they definitely won't conflict with anything.


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-05-18 16:53:47 UTC (rev 285)
+++ trunk/CMakeLists.txt	2007-05-18 18:26:14 UTC (rev 286)
@@ -267,7 +267,7 @@
         ADD_DEFINITIONS(-DGUI_STATIC_LINK_STDIO=1)
         SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} gui_stdio.c)
     ELSE(MOJOSETUP_GUI_STDIO_STATIC)
-        ADD_LIBRARY(stdio SHARED gui_stdio.c)
+        ADD_LIBRARY(mojosetupgui_stdio SHARED gui_stdio.c)
     ENDIF(MOJOSETUP_GUI_STDIO_STATIC)
 ENDIF(MOJOSETUP_GUI_STDIO)
 
@@ -280,8 +280,8 @@
             ADD_DEFINITIONS(-DGUI_STATIC_LINK_MACOSX=1)
             SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} gui_macosx.c)
         ELSE(MOJOSETUP_GUI_MACOSX_STATIC)
-            ADD_LIBRARY(macosx SHARED gui_macosx.c)
-            TARGET_LINK_LIBRARIES(macosx
+            ADD_LIBRARY(mojosetupgui_macosx SHARED gui_macosx.c)
+            TARGET_LINK_LIBRARIES(mojosetupgui_macosx
                 "-framework Carbon -mmacosx-version-min=10.2"
             )
         ENDIF(MOJOSETUP_GUI_MACOSX_STATIC)
@@ -309,9 +309,9 @@
             SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} gui_gtkplus2.c)
             SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${LIBGTK_LINK_FLAGS})
         ELSE(MOJOSETUP_GUI_GTKPLUS2_STATIC)
-            ADD_LIBRARY(gtkplus2 SHARED gui_gtkplus2.c)
+            ADD_LIBRARY(mojosetupgui_gtkplus2 SHARED gui_gtkplus2.c)
             ADD_DEFINITIONS(${LIBGTK_CFLAGS})
-            TARGET_LINK_LIBRARIES(gtkplus2 ${LIBGTK_LINK_FLAGS})
+            TARGET_LINK_LIBRARIES(mojosetupgui_gtkplus2 ${LIBGTK_LINK_FLAGS})
         ENDIF(MOJOSETUP_GUI_GTKPLUS2_STATIC)
     ENDIF(MOJOSETUP_GUI_GTKPLUS2)
 ENDIF(NOT LIBGTK_LINK_FLAGS)