Author: remi
Date: 2009-02-16 09:11:49 +0100 (Mon, 16 Feb 2009)
New Revision: 3646
Added:
software_suite_v2/tuxware/tuxosl-ose/trunk/lib/unix/
software_suite_v2/tuxware/tuxosl-ose/trunk/lib/win32/
Modified:
software_suite_v2/tuxware/tuxosl-ose/trunk/Makefile.win32
software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp
Log:
* added sub directories for output lib
* updated the makefile for windows
Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/Makefile.win32
===================================================================
--- software_suite_v2/tuxware/tuxosl-ose/trunk/Makefile.win32 2009-02-15
23:22:42 UTC (rev 3645)
+++ software_suite_v2/tuxware/tuxosl-ose/trunk/Makefile.win32 2009-02-16
08:11:49 UTC (rev 3646)
@@ -1,51 +1,70 @@
-PROJECT = libtuxosl
-CC2 = g++.exe
-OBJ_DIR = ./obj
-SRC_DIR = ./src
-OUTPUT_DIR = ./
-TARGET =
-C_INCLUDE_DIRS = -I C:/MinGWStudio/MinGW/include/ddk
-CFLAGS = -pipe -Wall -g0 -O2 -frtti -fexceptions
-LIB_DIRS = -L./dependencies/adspengine/lib/win32
-LIBS = -lportaudio -lwinmm -lhid -lsetupapi -lhidparse -ladspengine
-LDFLAGS = -pipe
-
-.PHONY: make clean
-
-make:
- -...@if [ ! -d "$(OBJ_DIR)" ]; then mkdir "$(OBJ_DIR)"; fi
- -...@if [ ! -d "$(OUTPUT_DIR)" ]; then mkdir "$(OUTPUT_DIR)"; fi
- -...@echo ---------------------------
- -...@echo --- Compile the modules ---
- -...@echo ---------------------------
- -...@echo log
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/log.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/log.o
- -...@echo misc compat
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/win32/miscCompat.cpp
$(C_INCLUDE_DIRS) -o $(OBJ_DIR)/miscCompat.o
- -...@echo misc
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/misc.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/misc.o
- -...@echo profiler
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/profiler.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/profiler.o
- -...@echo playback
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/win32/playback.cpp
$(C_INCLUDE_DIRS) -o $(OBJ_DIR)/playback.o
- -...@echo fifo
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/fifo.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/fifo.o
- -...@echo channel
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/channel.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/channel.o
- -...@echo equalizer
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/equalizer.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/equalizer.o
- -...@echo mixer
- -...@$(CC2) -c $(CFLAGS) $(SRC_DIR)/mixer.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/mixer.o
- -...@echo -------------------------
- -...@echo --- Compile main test ---
- -...@echo -------------------------
- -...@echo main cpp
- -...@$(CC2) -c $(CFLAGS) ./test/main.cpp $(C_INCLUDE_DIRS) -o
$(OBJ_DIR)/main_cpp.o
- -...@echo link test cpp
- -...@$(CC2) -o "$(OUTPUT_DIR)\OSL_OSE_TEST.exe" $(OBJ_DIR)/main_cpp.o
$(OBJ_DIR)/log.o $(OBJ_DIR)/miscCompat.o $(OBJ_DIR)/misc.o
$(OBJ_DIR)/profiler.o $(OBJ_DIR)/playback.o $(OBJ_DIR)/fifo.o
$(OBJ_DIR)/channel.o $(OBJ_DIR)/equalizer.o $(OBJ_DIR)/mixer.o $(LIB_DIRS)
$(LIBS) $(LDFLAGS)
- -...@rm -fR $(OBJ_DIR)/*.o
- -...@rmdir $(OBJ_DIR)
-
-clean:
- -...@rm -fR $(OBJ_DIR)/*.o
+PROJECT = Libtuxosl-ose
+CC = g++.exe
+
+BASE_DIR = .
+OBJ_DIR = $(BASE_DIR)/obj
+SRC_DIR = $(BASE_DIR)/src
+OUTPUT_DIR = ./
+TARGET = libtuxosl-ose.dll
+
+INCLUDE_DIRS = -I C:/MinGWStudio/MinGW/include/ddk
+CFLAGS = -pipe -Wall -g0 -O2 -frtti -fexceptions
+LDFLAGS = -pipe -shared
-Wl,--output-def,"$(OUTPUT_DIR)\libtuxosl-ose.def",--out-implib,"$(OUTPUT_DIR)\libtuxosl-ose.a"
-s
+
+LIB_DIRS = -L./dependencies/adspengine/lib/win32
+LIBS = -lportaudio -lwinmm -lhid -lsetupapi -lhidparse -ladspengine
+
+SRC_OBJS = \
+ $(OBJ_DIR)/log.o \
+ $(OBJ_DIR)/miscCompat.o \
+ $(OBJ_DIR)/misc.o \
+ $(OBJ_DIR)/profiler.o \
+ $(OBJ_DIR)/playback.o \
+ $(OBJ_DIR)/fifo.o \
+ $(OBJ_DIR)/channel.o \
+ $(OBJ_DIR)/equalizer.o \
+ $(OBJ_DIR)/mixer.o \
+ $(OBJ_DIR)/main.o
+
+.PHONY: make clean
+
+make:
+ -...@if [ ! -d "$(OBJ_DIR)" ]; then mkdir "$(OBJ_DIR)"; fi
+ -...@if [ ! -d "$(OUTPUT_DIR)" ]; then mkdir "$(OUTPUT_DIR)"; fi
+ -...@echo ---------------------------
+ -...@echo --- Compile the modules ---
+ -...@echo ---------------------------
+ -...@echo log
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/log.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/log.o
+ -...@echo misc compat
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/win32/miscCompat.cpp $(INCLUDE_DIRS)
-o $(OBJ_DIR)/miscCompat.o
+ -...@echo misc
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/misc.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/misc.o
+ -...@echo profiler
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/profiler.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/profiler.o
+ -...@echo playback
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/win32/playback.cpp $(INCLUDE_DIRS)
-o $(OBJ_DIR)/playback.o
+ -...@echo fifo
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/fifo.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/fifo.o
+ -...@echo channel
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/channel.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/channel.o
+ -...@echo equalizer
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/equalizer.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/equalizer.o
+ -...@echo mixer
+ -...@$(CC) -c $(CFLAGS) $(SRC_DIR)/mixer.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/mixer.o
+ -...@echo -------------------------
+ -...@echo --- Compile main test ---
+ -...@echo -------------------------
+ -...@echo main test
+ -...@$(CC) -c $(CFLAGS) ./test/main.cpp $(INCLUDE_DIRS) -o
$(OBJ_DIR)/main.o
+ -...@echo link main test as OSL_OSE_TEST.exe
+ -...@$(CC) -o "$(OUTPUT_DIR)\OSL_OSE_TEST.exe" $(SRC_OBJS) $(LIB_DIRS)
$(LIBS) -pipe
+ -...@echo --------------------------------
+ -...@echo --- Remove temporary objects ---
+ -...@echo --------------------------------
+ -...@rm -fR $(OBJ_DIR)/*.o
+ -...@rmdir $(OBJ_DIR)
+
+clean:
+ -...@rm -fR $(OBJ_DIR)/*.o
-...@rmdir $(OBJ_DIR)
\ No newline at end of file
Modified: software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp
===================================================================
--- software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp 2009-02-15
23:22:42 UTC (rev 3645)
+++ software_suite_v2/tuxware/tuxosl-ose/trunk/test/main.cpp 2009-02-16
08:11:49 UTC (rev 3646)
@@ -20,11 +20,7 @@
#include "../include/win32/playback.h"
#include "../include/log.h"
-#include "../include/types.h"
#include "../include/misc.h"
-#include "../include/fifo.h"
-#include "../include/channel.h"
-#include "../include/mixer.h"
/**
* \fn int main(void)
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
