diff options
10 files changed, 14 insertions, 9 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak index b5875df20a..5ed4989f5f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak @@ -22,7 +22,8 @@ MOTIF_HOME = /bluebird/teamswt/swt-builddir/motif21 # Define the various DLL (shared) libraries to be made. SWT_PREFIX = swt -SWT_DLL = lib$(SWT_PREFIX)$(DLL_VERSION).so +OS_PREFIX = aix +SWT_DLL = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so SWT_OBJ = callback.o globals.o library.o structs.o swt.o SWT_LIB = -L$(MOTIF_HOME) -G -bnoentry -lc_r -lC_r -lm -bexpall -lXm -lMrm -lXt -lX11 -lXext diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak index def0e62635..91a1e215e7 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak @@ -24,19 +24,20 @@ QT_HOME = /usr/lib/qt-2.2.0 # Define the various DLL (shared) libraries to be made. SWT_PREFIX = swt -SWT_DLL = lib$(SWT_PREFIX)$(DLL_VERSION).so +OS_PREFIX = linux +SWT_DLL = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so SWT_OBJ = callback.o globals.o library.o structs.o swt.o SWT_LIB = -L$(MOTIF_HOME)/lib -lXm -L/usr/lib -L/usr/X11R6/lib \ -x -shared -lX11 -lm -lXext -lXt -lXp -lXpm -ldl GNOME_PREFIX = swt-gnome -GNOME_DLL = lib$(GNOME_PREFIX)$(DLL_VERSION).so +GNOME_DLL = lib$(GNOME_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so GNOME_OBJ = gnome.o GNOME_LIB = -x -shared \ `gnome-config --libs gnome` KDE_PREFIX = swt-kde -KDE_DLL = lib$(KDE_PREFIX)$(DLL_VERSION).so +KDE_DLL = lib$(KDE_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so KDE_OBJ = kde.o KDE_LIB = -L/usr/lib -L$(QT_HOME)/lib \ -shared -lksycoca -lkdecore -lq diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak index 094c3200ab..94ee0df780 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak @@ -24,13 +24,14 @@ CDE_HOME = /usr/dt # Define the various DLL (shared) libraries to be made. SWT_PREFIX = swt -SWT_DLL = lib$(SWT_PREFIX)$(DLL_VERSION).so +OS_PREFIX = solaris +SWT_DLL = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so SWT_OBJ = callback.o globals.o library.o structs.o swt.o SWT_LIB = -L$(MOTIF_HOME)/lib -L/usr/lib \ -G -lXm -lXt -lX11 -lm CDE_PREFIX = swt-cde -CDE_DLL = lib$(CDE_PREFIX)$(DLL_VERSION).so +CDE_DLL = lib$(CDE_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so CDE_OBJ = cde.o CDE_LIB = -G -L$(CDE_HOME)/lib -lDtSvc diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak index 6c3e54fb13..a55fa8231b 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak @@ -10,7 +10,8 @@ revision=0 #assumes IVE_HOME is set in the environment DLLPREFIX=swt -DLLNAME=lib$(DLLPREFIX)$(maj_ver)$(min_ver).so +OSPREFIX="neutrino" +DLLNAME=lib$(DLLPREFIX)-$(OSPREFIX)-$(maj_ver)$(min_ver).so #DLLNAME=lib$(DLLPREFIX)$(maj_ver)$(min_ver)r$(revision).so DEBUG = diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak index 8fa3f88209..9df50b9ceb 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak @@ -23,7 +23,8 @@ copyright = "Copyright (C) IBM Corporation 1999, 2000. All rights reserved." # assumes JAVA_HOME is set in the environment from which nmake is run
DLLPREFIX=swt
-DLLNAME=$(DLLPREFIX)$(maj_ver)$(min_ver).dll
+OSPREFIX=win32
+DLLNAME=$(DLLPREFIX)-$(OSPREFIX)-$(maj_ver)$(min_ver).dll
LIBNAME=swt# declaration
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc index 986799fd72..2b9c3bb69f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc @@ -55,7 +55,7 @@ BEGIN VALUE "FileVersion", "win32 1.131\0"
VALUE "InternalName", "SWT\0"
VALUE "LegalCopyright", "© Copyright IBM Corp. 2000, 2001. All Rights Reserved.\0"
- VALUE "OriginalFilename", "swt1131.dll\0"
+ VALUE "OriginalFilename", "swt-win32-1131.dll\0"
VALUE "ProductName", "\0"
VALUE "ProductVersion", "0, 0, 0, 0\0"
END
diff --git a/bundles/org.eclipse.swt/ws/motif/libswt-gnome1131.so b/bundles/org.eclipse.swt/ws/motif/libswt-gnome-linux-1131.so Binary files differindex 3c3ba7ecda..3c3ba7ecda 100644 --- a/bundles/org.eclipse.swt/ws/motif/libswt-gnome1131.so +++ b/bundles/org.eclipse.swt/ws/motif/libswt-gnome-linux-1131.so diff --git a/bundles/org.eclipse.swt/ws/motif/libswt1131.so b/bundles/org.eclipse.swt/ws/motif/libswt-linux-1131.so Binary files differindex c784b80d56..c784b80d56 100644 --- a/bundles/org.eclipse.swt/ws/motif/libswt1131.so +++ b/bundles/org.eclipse.swt/ws/motif/libswt-linux-1131.so diff --git a/bundles/org.eclipse.swt/ws/photon/libswt1131.so b/bundles/org.eclipse.swt/ws/photon/libswt-neutrino-1131.so Binary files differindex 5f8654fb73..5f8654fb73 100644 --- a/bundles/org.eclipse.swt/ws/photon/libswt1131.so +++ b/bundles/org.eclipse.swt/ws/photon/libswt-neutrino-1131.so diff --git a/bundles/org.eclipse.swt/ws/win32/swt1131.dll b/bundles/org.eclipse.swt/ws/win32/swt-win32-1131.dll Binary files differindex 51220da419..51220da419 100644 --- a/bundles/org.eclipse.swt/ws/win32/swt1131.dll +++ b/bundles/org.eclipse.swt/ws/win32/swt-win32-1131.dll |