logo       
Google Custom Search
    AddThis Social Bookmark Button

cvs: uisimulator/win32 plugin-win32.h,NONE,1.1 Makefile,1.56,1.57 plugin-wi: msg#00093

Subject: cvs: uisimulator/win32 plugin-win32.h,NONE,1.1 Makefile,1.56,1.57 plugin-win32.c,1.2,NONE
Update of /cvsroot/rockbox/uisimulator/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv20258

Modified Files:
        Makefile 
Added Files:
        plugin-win32.h 
Removed Files:
        plugin-win32.c 
Log Message:
Changed win32 simulator to use plugin.c

--- NEW FILE: plugin-win32.h ---
/***************************************************************************
 *             __________               __   ___.
 *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
 * $Id: plugin-win32.h,v 1.1 2003/06/29 23:37:17 hardeeps Exp $
 *
 * Copyright (C) 2002 Björn Stenberg
 *
 * All files in this archive are subject to the GNU General Public License.
 * See the file COPYING in the source tree root for full license agreement.
 *
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 * KIND, either express or implied.
 *
 ****************************************************************************/

#include <windows.h>
#include "plugin.h"
#include "file.h"

#define RTLD_NOW 0

#undef filesize
#define filesize win32_filesize

#undef ftruncate
#define ftruncate NULL

typedef enum plugin_status (*plugin_fn)(struct plugin_api* api, void* param);

#define dlopen(_x_, _y_) LoadLibrary(_x_)
#define dlsym(_x_, _y_) (plugin_fn)GetProcAddress(_x_, _y_)
#define dlclose(_x_) FreeLibrary(_x_)
#define dlerror() "Unknown"

Index: Makefile
===================================================================
RCS file: /cvsroot/rockbox/uisimulator/win32/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Makefile    29 Jun 2003 21:57:31 -0000      1.56
+++ Makefile    29 Jun 2003 23:37:17 -0000      1.57
@@ -98,7 +98,7 @@
 APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \
        playlist.c wps.c wps-display.c settings.c status.c \
        screens.c peakmeter.c sleeptimer.c keyboard.c onplay.c\
-       misc.c
+       misc.c plugin.c
 
 MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c
 
@@ -108,12 +108,11 @@
 
 SRCS = button.c dir-win32.c lcd-win32.c panic-win32.c thread-win32.c \
        debug-win32.c kernel.c string-win32.c uisw32.c stubs.c \
-       $(APPS) $(MENUS) $(FIRMSRCS) strtok.c sim_icons.c io.c plugin-win32.c
+       $(APPS) $(MENUS) $(FIRMSRCS) strtok.c sim_icons.c io.c
 
 OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o
 
-ROCKSRCS = bounce.c cube.c flipit.c helloworld.c sliding_puzzle.c snow.c \
-            sokoban.c star.c tetris.c viewer.c wormlet.c
+ROCKSRCS := $(patsubst $(PLUGINDIR)/%.c,%.c,$(wildcard $(PLUGINDIR)/*.c))
 
 ROCKS := $(ROCKSRCS:%.c=$(OBJDIR)/%.rock)
 
@@ -197,6 +196,9 @@
 $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c
        $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/plugin.o: $(APPDIR)/plugin.c plugin-win32.h
+       $(CC) $(APPCFLAGS) -c $< -o $@
+
 $(OBJDIR)/build.lang: $(APPDIR)/lang/$(LANGUAGE).lang
        perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@
 
@@ -292,7 +294,7 @@
        $(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.po
-       $(DLL) $(DLLFLAGS) $< -o $@
+       -$(DLL) $(DLLFLAGS) $< -o $@
 
 DEPS:=$(OBJDIR)/.deps
 

--- plugin-win32.c DELETED ---




<Prev in Thread] Current Thread [Next in Thread>